--- old/test/jdk/TEST.groups	2017-12-07 11:42:55.316806967 -0800
+++ new/test/jdk/TEST.groups	2017-12-07 11:42:55.156806971 -0800
@@ -89,7 +89,6 @@
 jdk_util_other = \
     java/util \
     sun/util \
-    jdk/internal/util \
     -:jdk_collections \
     -:jdk_concurrent \
     -:jdk_stream
@@ -352,6 +351,18 @@
 jdk_client_sanity = \
     sanity/client/SwingSet
 
+# This test group represents a subset of tests which are expected to
+# exercise most of the most commuonly used code in Swing applications.
+# New failures in this area may be a problem.
+jdk_swing_core = \
+     sanity/client/SwingSet \
+     javax/swing
+
+# The most commonly used printing APIs are included here along with swing core.
+jdk_desktop_core = \
+    :jdk_swing_core \
+    java/awt/print
+
 ###############################################################################
 #
 # Serviceability sanity groups