diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
index d7ca0a86a6b..523d9d9def9 100644
--- a/test/jdk/ProblemList.txt
+++ b/test/jdk/ProblemList.txt
@@ -828,7 +828,6 @@ java/awt/im/memoryleak/InputContextMemoryLeakTest.java 8023814 linux-all,solaris
 # core_tools
 
 tools/pack200/CommandLineTests.java                             8059906 generic-all
-tools/jimage/JImageListTest.java                                8206445 windows-all
 
 ############################################################################
 
diff --git a/test/jdk/tools/jimage/JImageListTest.java b/test/jdk/tools/jimage/JImageListTest.java
index a98c00c8ba0..364a9dd5ae6 100644
--- a/test/jdk/tools/jimage/JImageListTest.java
+++ b/test/jdk/tools/jimage/JImageListTest.java
@@ -224,6 +224,8 @@ public class JImageListTest extends JImageCliTest {
 
     public static void main(String[] args) throws Throwable {
         new JImageListTest().runTests();
+        // Just to ensure that jimage files will be unmapped
+        System.gc();
     }
 }