--- old/test/TEST.groups	2013-08-29 17:04:46.073403497 -0700
+++ new/test/TEST.groups	2013-08-29 17:04:45.913403490 -0700
@@ -25,14 +25,85 @@
     -java/lang/management \
     -java/lang/instrument \
     sun/invoke \
+    jdk/lambda \
     sun/misc \
     sun/reflect \
     vm
 
 jdk_util = \
-    java/util \
+    :jdk_collections \
+    :jdk_concurrent \
+    :jdk_stream \
+    java/util/Random \
+    java/util/IllegalFormatException \
+    java/util/Base64 \
+    java/util/Timer \
+    java/util/jar \
+    java/util/zip \
+    java/util/regex \
+    java/util/Observable \
+    java/util/PluggableLocale \
+    java/util/logging \
+    java/util/StringJoiner \
+    java/util/StringTokenizer \
+    java/util/Scanner \
+    java/util/Formattable \
+    java/util/Formatter \
+    java/util/Objects \
+    java/util/prefs \
+    java/util/Locale \
+    java/util/Currency \
+    java/util/Calendar \
+    java/util/TimeZone \
+    java/util/Properties \
+    java/util/ServiceLoader \
+    java/util/UUID \
+    java/util/spi \
+    java/util/MissingFormatArgumentException \
+    java/util/ResourceBundle \
     sun/util
 
+# Maintained by JSR-166 EG (Doug Lea et al)
+# Deque and PriorityQueue are also generally maintained by JSR-166
+jdk_concurrent = \
+    java/util/concurrent \
+    java/util/Deque \
+    java/util/PriorityQueue
+    
+jdk_collections = \
+    java/util/AbstractCollection \
+    java/util/AbstractList \
+    java/util/AbstractMap \
+    java/util/AbstractSequentialList \
+    java/util/ArrayList \
+    java/util/Arrays \
+    java/util/BitSet \
+    java/util/Collection \
+    java/util/Collections \
+    java/util/EnumMap \
+    java/util/EnumSet \
+    java/util/Comparator \
+    java/util/Iterator \
+    java/util/HashMap \
+    java/util/Hashtable \
+    java/util/IdentityHashMap \
+    java/util/List \
+    java/util/LinkedHashMap \
+    java/util/LinkedHashSet \
+    java/util/LinkedList \
+    java/util/Map \
+    java/util/NavigableMap \
+    java/util/TimSort \
+    java/util/TreeMap \
+    java/util/Vector \
+    java/util/WeakHashMap
+
+jdk_stream = \
+    java/util/Optional \
+    java/util/SummaryStatistics \
+    java/util/function \
+    java/util/stream
+
 jdk_math = \
     java/math
 
@@ -133,7 +204,6 @@
     javax/xml \
     -javax/xml/crypto \
     jdk/asm \
-    jdk/lambda \
     com/sun/jndi \
     com/sun/corba \
     lib/testlibrary \