diff --git a/openjdk/excludes/ProblemList_openjdk24-openj9.txt b/openjdk/excludes/ProblemList_openjdk24-openj9.txt
index e6aeae56f4..55a32831fc 100644
--- a/openjdk/excludes/ProblemList_openjdk24-openj9.txt
+++ b/openjdk/excludes/ProblemList_openjdk24-openj9.txt
@@ -179,6 +179,8 @@ java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-notify https://github
 java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-notify-interrupt https://github.com/eclipse-openj9/openj9/issues/21426 generic-all
 java/lang/ScopedValue/ManyBindings.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/ScopedValue/ManyBindings.java.ManyBindings https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/lang/ScopedValue/ScopedValueAPI.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
+java/lang/Thread/virtual/CustomScheduler.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
 java/lang/Thread/virtual/Parking.java#Xcomp-noTieredCompilation.Parking_Xcomp-noTieredCompilation https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/Parking.java#Xint.Parking_Xint https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/Parking.java#Xcomp https://github.com/eclipse-openj9/openj9/issues/21446 generic-all
@@ -188,8 +190,10 @@ java/lang/Thread/virtual/Parking.java#default https://github.com/eclipse-openj9/
 java/lang/Thread/virtual/Reflection.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/Reflection.java.Reflection https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/TraceVirtualThreadLocals.java https://github.com/eclipse-openj9/openj9/issues/21441 generic-all
-java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-interrupt.TimedWaitALot_timeout-interrupt https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout.TimedWaitALot_timeout https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/lang/Thread/virtual/stress/CompletableFutureTimedGet.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
+java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java#id0 https://github.com/eclipse-openj9/openj9/issues/21445 aix-all
+java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-interrupt https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 
 ############################################################################
 
@@ -537,16 +541,17 @@ java/util/zip/DeflateIn_InflateOut.java https://github.com/eclipse-openj9/openj9
 java/util/zip/ZipFile/TestCleaner.java https://github.com/eclipse-openj9/openj9/issues/8872  generic-all
 java/util/zip/ZipFile/ZipSourceCache.java https://github.com/eclipse-openj9/openj9/issues/18987 linux-s390x
 java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java https://github.com/eclipse-openj9/openj9/issues/11135 generic-all
-java/util/concurrent/ExecutorService/InvokeTest.java.InvokeTest https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#platform.StructuredTaskScopeTest_platform https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#virtual.StructuredTaskScopeTest_virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java#virtual.ThreadPerTaskExecutorTest_virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/tck/JSR166TestCase.java#default.JSR166TestCase_default https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism.JSR166TestCase_forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/tck/JSR166TestCase.java#others.JSR166TestCase_others https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/ExecutorService/InvokeTest.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/ExecutorService/SubmitTest.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
+java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#platform https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java#virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/tck/JSR166TestCase.java#default https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/tck/JSR166TestCase.java#others https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21442 generic-all
 java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21442 generic-all
-java/util/stream/GatherersMapConcurrentTest.java.GatherersMapConcurrentTest https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/stream/GatherersMapConcurrentTest.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 
 ############################################################################
 
diff --git a/openjdk/excludes/ProblemList_openjdk25-openj9.txt b/openjdk/excludes/ProblemList_openjdk25-openj9.txt
index a9144e4fe6..93bfbfaf7b 100644
--- a/openjdk/excludes/ProblemList_openjdk25-openj9.txt
+++ b/openjdk/excludes/ProblemList_openjdk25-openj9.txt
@@ -157,6 +157,8 @@ java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-notify https://github
 java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-notify-interrupt https://github.com/eclipse-openj9/openj9/issues/21426 generic-all
 java/lang/ScopedValue/ManyBindings.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/ScopedValue/ManyBindings.java.ManyBindings https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/lang/ScopedValue/ScopedValueAPI.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
+java/lang/Thread/virtual/CustomScheduler.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
 java/lang/Thread/virtual/Parking.java#Xcomp-noTieredCompilation.Parking_Xcomp-noTieredCompilation https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/Parking.java#Xint.Parking_Xint https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/Parking.java#Xcomp https://github.com/eclipse-openj9/openj9/issues/21446 generic-all
@@ -166,8 +168,10 @@ java/lang/Thread/virtual/Parking.java#default https://github.com/eclipse-openj9/
 java/lang/Thread/virtual/Reflection.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/Reflection.java.Reflection https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/lang/Thread/virtual/TraceVirtualThreadLocals.java https://github.com/eclipse-openj9/openj9/issues/21441 generic-all
-java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-interrupt.TimedWaitALot_timeout-interrupt https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout.TimedWaitALot_timeout https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/lang/Thread/virtual/stress/CompletableFutureTimedGet.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
+java/lang/Thread/virtual/stress/GetStackTraceALotWithTimedWait.java#id0 https://github.com/eclipse-openj9/openj9/issues/21445 aix-all
+java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/lang/Thread/virtual/stress/TimedWaitALot.java#timeout-interrupt https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 
 ############################################################################
 
@@ -515,16 +519,17 @@ java/util/zip/DeflateIn_InflateOut.java https://github.com/eclipse-openj9/openj9
 java/util/zip/ZipFile/TestCleaner.java https://github.com/eclipse-openj9/openj9/issues/8872  generic-all
 java/util/zip/ZipFile/ZipSourceCache.java https://github.com/eclipse-openj9/openj9/issues/18987 linux-s390x
 java/util/stream/test/org/openjdk/tests/java/util/stream/SpliteratorTest.java https://github.com/eclipse-openj9/openj9/issues/11135 generic-all
-java/util/concurrent/ExecutorService/InvokeTest.java.InvokeTest https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#platform.StructuredTaskScopeTest_platform https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#virtual.StructuredTaskScopeTest_virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java#virtual.ThreadPerTaskExecutorTest_virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/tck/JSR166TestCase.java#default.JSR166TestCase_default https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism.JSR166TestCase_forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
-java/util/concurrent/tck/JSR166TestCase.java#others.JSR166TestCase_others https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/ExecutorService/InvokeTest.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/ExecutorService/SubmitTest.java https://github.com/eclipse-openj9/openj9/issues/21445 linux-ppc64le
+java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#platform https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/StructuredTaskScope/StructuredTaskScopeTest.java#virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/ThreadPerTaskExecutor/ThreadPerTaskExecutorTest.java#virtual https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/tck/JSR166TestCase.java#default https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/concurrent/tck/JSR166TestCase.java#others https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21442 generic-all
 java/util/concurrent/tck/JSR166TestCase.java#forkjoinpool-common-parallelism https://github.com/eclipse-openj9/openj9/issues/21442 generic-all
-java/util/stream/GatherersMapConcurrentTest.java.GatherersMapConcurrentTest https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
+java/util/stream/GatherersMapConcurrentTest.java https://github.com/eclipse-openj9/openj9/issues/21445 generic-all
 
 ############################################################################