diff --git a/test/TEST.groups b/test/TEST.groups
index bae5a9b3469e6362ff1bbeb80a2ae1096e50cc83..aa597590eefe4f237690bf1e87922281be66cfad 100644
--- a/test/TEST.groups
+++ b/test/TEST.groups
@@ -193,6 +193,7 @@ compact1_minimal = \
   serviceability/ \
   compiler/ \
   testlibrary/ \
+  testlibrary_tests/ \
   sanity/ \
   runtime/ \
   gc/ \
diff --git a/test/testlibrary/AssertsTest.java b/test/testlibrary_tests/AssertsTest.java
similarity index 100%
rename from test/testlibrary/AssertsTest.java
rename to test/testlibrary_tests/AssertsTest.java
diff --git a/test/testlibrary/OutputAnalyzerReportingTest.java b/test/testlibrary_tests/OutputAnalyzerReportingTest.java
similarity index 100%
rename from test/testlibrary/OutputAnalyzerReportingTest.java
rename to test/testlibrary_tests/OutputAnalyzerReportingTest.java
diff --git a/test/testlibrary/OutputAnalyzerTest.java b/test/testlibrary_tests/OutputAnalyzerTest.java
similarity index 100%
rename from test/testlibrary/OutputAnalyzerTest.java
rename to test/testlibrary_tests/OutputAnalyzerTest.java