--- a/hotspot/test/TEST.groups	Mon May 11 16:30:26 2015 +0200
+++ b/hotspot/test/TEST.groups	Wed May 13 15:16:06 2015 +0200
@@ -249,7 +249,7 @@
   gc/arguments/TestMaxNewSize.java \
   gc/arguments/TestSerialHeapSizeFlags.java \
   gc/arguments/TestUseCompressedOopsErgo.java \
-  gc/defnew/HeapChangeLogging.java \
+  gc/serial/HeapChangeLogging.java \
   gc/metaspace/TestMetaspacePerfCounters.java \
   gc/metaspace/TestPerfCountersAndMemoryPools.java \
   gc/startup_warnings/TestSerialGC.java 
@@ -265,7 +265,7 @@
   gc/arguments/TestUseCompressedOopsErgo.java \
   gc/ergonomics/TestDynamicNumberOfGCThreads.java
   gc/metaspace/TestMetaspacePerfCounters.java \
-  gc/parallelScavenge/ \
+  gc/parallel/ \
   gc/startup_warnings/TestParallelGC.java \
   gc/startup_warnings/TestParallelScavengeSerialOld.java
 
@@ -280,7 +280,7 @@
   gc/arguments/TestParallelGCThreads.java \
   gc/arguments/TestUseCompressedOopsErgo.java \
   gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java \
-  gc/concurrentMarkSweep/ \
+  gc/cms/ \
   gc/ergonomics/TestDynamicNumberOfGCThreads.java
   gc/startup_warnings/TestCMS.java \
   gc/startup_warnings/TestDefNewCMS.java \