diff --git a/test/hotspot/jtreg/ProblemList.txt b/test/hotspot/jtreg/ProblemList.txt
index f6913a0734d..d82f4a919fa 100644
--- a/test/hotspot/jtreg/ProblemList.txt
+++ b/test/hotspot/jtreg/ProblemList.txt
@@ -113,7 +113,6 @@ runtime/StackGuardPages/TestStackGuardPagesNative.java 8303612 linux-all
 runtime/ErrorHandling/TestDwarf.java#checkDecoder 8305489 linux-all
 runtime/ErrorHandling/MachCodeFramesInErrorFile.java 8313315 linux-ppc64le
 runtime/cds/appcds/customLoader/HelloCustom_JFR.java 8241075 linux-all,windows-x64
-runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java 8323032 generic-all
 
 applications/jcstress/copy.java 8229852 linux-all
 
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
index 53de474d9cd..aeb5696830d 100644
--- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
+++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/modulepath/OptimizeModuleHandlingTest.java
@@ -345,20 +345,26 @@ public class OptimizeModuleHandlingTest {
                    .shouldNotContain(OPTIMIZE_ENABLED)
                    .shouldContain(MAP_FAILED);
             });
-        // Dump an archive with only -Xbootclasspath/a
-        output = TestCommon.createArchive(
-                                null,
-                                appClasses,
-                                "-Xbootclasspath/a:" + mainJar.toString());
-        TestCommon.checkDump(output);
-        tty("13. run with CDS on,  with the same -Xbootclasspath/a as dump time and adding a -cp with test.jar:  should pass");
-        TestCommon.run("-Xlog:cds,class+load",
-                       "-cp", testJar.toString(),
-                       "-Xbootclasspath/a:" + mainJar.toString(),
-                       MAIN_CLASS)
-            .assertNormalExit(out -> {
-                out.shouldMatch(MAIN_FROM_CDS)
-                   .shouldContain(OPTIMIZE_ENABLED);
+
+        // Skip the following test for dynamic CDS archive because the current
+        // dynamic dump test utililty does not support empty -cp with a classlist.
+        // (see createArchive(CDSOptions opts) in TestCommon.java)
+        if (!CDSTestUtils.isDynamicArchive()) {
+            // Dump an archive with only -Xbootclasspath/a
+            output = TestCommon.createArchive(
+                                    null,
+                                    appClasses,
+                                    "-Xbootclasspath/a:" + mainJar.toString());
+            TestCommon.checkDump(output);
+            tty("13. run with CDS on,  with the same -Xbootclasspath/a as dump time and adding a -cp with test.jar:  should pass");
+            TestCommon.run("-Xlog:cds,class+load",
+                           "-cp", testJar.toString(),
+                           "-Xbootclasspath/a:" + mainJar.toString(),
+                           MAIN_CLASS)
+                .assertNormalExit(out -> {
+                    out.shouldMatch(MAIN_FROM_CDS)
+                       .shouldContain(OPTIMIZE_ENABLED);
             });
+        }
     }
 }