diff -r b0bf57cd1e9d -r 0b2894b5e67c hotspot/test/TEST.groups
--- a/hotspot/test/TEST.groups	Fri Dec 19 09:21:06 2014 +0100
+++ b/hotspot/test/TEST.groups	Thu Dec 18 16:15:49 2014 +0100
@@ -50,6 +50,9 @@
 # runs those tests that only require compact1 and compact2 API's.
 #
 
+hotspot_all = \
+  /
+
 # Full JDK can run all tests
 #
 jdk = \
@@ -435,13 +438,15 @@
   sanity/ExecuteInternalVMTests.java \
   serviceability/dcmd/compiler
 
-hotspot_all = \
+hotspot_jprt = \
+  :hotspot_wbapitest \
   :hotspot_compiler_1 \
   :hotspot_compiler_2 \
   :hotspot_compiler_3 \
   :hotspot_compiler_closed \
   :hotspot_gc \
   :hotspot_runtime \
+  :hotspot_runtime_closed \
   :hotspot_serviceability
 
 #All tests that depends on nashorn extension.