--- a/test/jdk/ProblemList.txt	Fri Nov 09 22:25:40 2018 -0800
+++ b/test/jdk/ProblemList.txt	Sat Nov 10 09:52:59 2018 -0800
@@ -790,7 +790,6 @@
 javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 8042383 macosx-all
 javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java 8065099 macosx-all
 javax/swing/DataTransfer/8059739/bug8059739.java 8199074 generic-all
-javax/swing/GroupLayout/6613904/bug6613904.java 8199072 generic-all
 javax/swing/JCheckBox/8032667/bug8032667_image_diff.java 8199063 macosx-all
 javax/swing/JComboBox/7031551/bug7031551.java 8199056 generic-all
 javax/swing/JScrollBar/6924059/bug6924059.java 8199078 generic-all

--- a/test/jdk/javax/swing/GroupLayout/6613904/bug6613904.java	Fri Nov 09 22:25:40 2018 -0800
+++ b/test/jdk/javax/swing/GroupLayout/6613904/bug6613904.java	Sat Nov 10 09:52:59 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,11 +28,13 @@
  * @author Pavel Porvatov
  */
 
-import javax.swing.*;
+import javax.swing.GroupLayout;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 
 public class bug6613904 {
-    public static void main(String[] args) {
-        SwingUtilities.invokeLater(new Runnable() {
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(new Runnable() {
             public void run() {
                 GroupLayout groupLayout = new GroupLayout(new JPanel());