--- a/jdk/test/TEST.groups	Mon Mar 21 10:27:50 2016 +0100
+++ b/jdk/test/TEST.groups	Tue Mar 22 10:42:32 2016 +0000
@@ -78,6 +78,7 @@
     jdk/lambda \
     jdk/internal/misc \
     jdk/internal/ref \
+    jdk/modules \
     vm
 
 # All of the java.util package
@@ -241,7 +242,6 @@
 #
 core_tools = \
     tools \
-    jdk/internal/jimage \
     jdk/internal/jrtfs \
     sun/tools/java \
     sun/tools/jrunscript
@@ -524,7 +524,6 @@
   java/util/jar/Manifest/CreateManifest.java \
   java/util/logging/TestMainAppContext.java \
   java/util/logging/TestLoggingWithMainAppContext.java \
-  java/util/ResourceBundle/Control/Bug6530694.java \
   java/text/Bidi/BidiConformance.java \
   java/text/Bidi/BidiEmbeddingTest.java \
   java/text/Bidi/Bug7042148.java \