diff --git a/openjdk/ProblemList_openjdk11-openj9.txt b/openjdk/ProblemList_openjdk11-openj9.txt
index 2f540b2eca..7aee5ff543 100644
--- a/openjdk/ProblemList_openjdk11-openj9.txt
+++ b/openjdk/ProblemList_openjdk11-openj9.txt
@@ -92,11 +92,11 @@ java/lang/invoke/MethodHandlesGeneralTest.java	https://github.com/eclipse/openj9
 java/lang/invoke/MethodHandlesInsertArgumentsTest.java	https://github.com/eclipse/openj9/issues/7057	generic-all
 java/lang/invoke/PrivateInterfaceCall.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1297	generic-all
 java/lang/invoke/PrivateInvokeTest.java	https://github.com/eclipse/openj9/issues/7071	generic-all
-java/lang/invoke/RevealDirectTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
-java/lang/invoke/SpecialInterfaceCall.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
+java/lang/invoke/RevealDirectTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1344	generic-all
+java/lang/invoke/SpecialInterfaceCall.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1297	generic-all
 java/lang/invoke/SpreadCollectTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1297	generic-all
 java/lang/invoke/TryFinallyTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1297	generic-all
-java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
+java/lang/invoke/VarHandle/AccessMode/OptimalMapSize.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/1297	generic-all
 java/lang/invoke/VarHandles/VarHandleTestAccessModeMethodNames.java	https://github.com/eclipse/openj9/issues/3181	generic-all
 java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessBoolean.java	https://github.com/eclipse/openj9/issues/3940	generic-all
 java/lang/invoke/VarHandles/VarHandleTestMethodHandleAccessByte.java	https://github.com/eclipse/openj9/issues/3940	generic-all
@@ -112,7 +112,6 @@ java/lang/invoke/VarHandles/accessibility/TestFieldLookupAccessibility.java	http
 java/lang/invoke/VarargsArrayTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
 java/lang/invoke/condy/CondyNestedTest.java https://github.com/eclipse/openj9/issues/4127 linux-ppc64le
 java/lang/invoke/lambda/LambdaStackTrace.java	https://github.com/eclipse/openj9/issues/3394	generic-all
-java/lang/module/AutomaticModulesTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
 java/lang/module/ModuleFinderTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/749	windows-all
 java/lang/ref/CleanerTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
 java/lang/ref/EarlyTimeout.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
diff --git a/openjdk/ProblemList_openjdk13-openj9.txt b/openjdk/ProblemList_openjdk13-openj9.txt
index 257c27591c..0e394f7bd5 100644
--- a/openjdk/ProblemList_openjdk13-openj9.txt
+++ b/openjdk/ProblemList_openjdk13-openj9.txt
@@ -12,7 +12,7 @@
 # limitations under the License.
 ############################################################################
 
-# To determine required OS exclusion string see http://hg.openjdk.java.net/code-tools/jtreg/file/6f00c63c0a98/src/share/classes/com/sun/javatest/regtest/config/OS.java 
+# To determine required OS exclusion string see http://hg.openjdk.java.net/code-tools/jtreg/file/6f00c63c0a98/src/share/classes/com/sun/javatest/regtest/config/OS.java
 
 ############################################################################
 
@@ -123,7 +123,6 @@ java/lang/invoke/VarHandles/VarHandleTestReflection.java	https://github.com/Adop
 java/lang/invoke/VarargsArrayTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
 java/lang/invoke/condy/CondyNestedTest.java https://github.com/eclipse/openj9/issues/4127 linux-ppc64le
 java/lang/invoke/lambda/LambdaStackTrace.java	https://github.com/eclipse/openj9/issues/3394	generic-all
-java/lang/module/AutomaticModulesTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
 java/lang/module/ModuleFinderTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/749	windows-all
 java/lang/ref/CleanerTest.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all
 java/lang/ref/EarlyTimeout.java	https://github.com/AdoptOpenJDK/openjdk-tests/issues/585	generic-all