diff --git a/test/jdk/ProblemList-generational-zgc.txt b/test/jdk/ProblemList-generational-zgc.txt
index ee3e59887a2..bc37842f5ef 100644
--- a/test/jdk/ProblemList-generational-zgc.txt
+++ b/test/jdk/ProblemList-generational-zgc.txt
@@ -37,5 +37,5 @@ sun/tools/jhsdb/SAGetoptTest.java                  8307393   generic-all
 sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8307393   generic-all
 sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8307393   generic-all
 
-java/util/concurrent/locks/Lock/OOMEInAQS.java 8298066 linux-all,windows-x64
+java/util/concurrent/locks/Lock/OOMEInAQS.java 8298066 generic-all
 com/sun/jdi/ThreadMemoryLeakTest.java          8307402 generic-all
diff --git a/test/jdk/ProblemList-zgc.txt b/test/jdk/ProblemList-zgc.txt
index 945eaee938c..e2897185dee 100644
--- a/test/jdk/ProblemList-zgc.txt
+++ b/test/jdk/ProblemList-zgc.txt
@@ -27,4 +27,4 @@
 #
 #############################################################################
 
-java/util/concurrent/locks/Lock/OOMEInAQS.java 8298066 linux-all,windows-x64
+java/util/concurrent/locks/Lock/OOMEInAQS.java 8298066 generic-all