diff --git a/hotspot/test/TEST.groups b/hotspot/test/TEST.groups
index 5705527c728..18dc949a024 100644
--- a/hotspot/test/TEST.groups
+++ b/hotspot/test/TEST.groups
@@ -338,6 +338,7 @@ hotspot_fast_gc_2 = \
   sanity/ExecuteInternalVMTests.java \
   gc/ \
   -gc/g1/ \
+  -gc/stress \
   -gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java \
   -gc/cms/TestMBeanCMS.java \
   -gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java
@@ -346,7 +347,7 @@ hotspot_fast_gc_closed = \
   sanity/ExecuteInternalVMTests.java
 
 hotspot_fast_gc_gcold = \
-  stress/gc/TestGCOld.java
+  gc/stress/TestGCOld.java
 
 hotspot_fast_runtime = \
   runtime/ \
diff --git a/hotspot/test/stress/gc/TestGCOld.java b/hotspot/test/gc/stress/TestGCOld.java
similarity index 100%
rename from hotspot/test/stress/gc/TestGCOld.java
rename to hotspot/test/gc/stress/TestGCOld.java
diff --git a/hotspot/test/stress/gc/TestMultiThreadStressRSet.java b/hotspot/test/gc/stress/TestMultiThreadStressRSet.java
similarity index 100%
rename from hotspot/test/stress/gc/TestMultiThreadStressRSet.java
rename to hotspot/test/gc/stress/TestMultiThreadStressRSet.java
diff --git a/hotspot/test/stress/gc/TestStressIHOPMultiThread.java b/hotspot/test/gc/stress/TestStressIHOPMultiThread.java
similarity index 100%
rename from hotspot/test/stress/gc/TestStressIHOPMultiThread.java
rename to hotspot/test/gc/stress/TestStressIHOPMultiThread.java
diff --git a/hotspot/test/stress/gc/TestStressRSetCoarsening.java b/hotspot/test/gc/stress/TestStressRSetCoarsening.java
similarity index 100%
rename from hotspot/test/stress/gc/TestStressRSetCoarsening.java
rename to hotspot/test/gc/stress/TestStressRSetCoarsening.java