--- a/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java	Mon Apr 30 13:40:39 2018 -0700
+++ b/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java	Mon Apr 30 16:59:05 2018 -0400
@@ -53,9 +53,6 @@
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             heapsize,
             "-XX:+IgnoreUnrecognizedVMOptions",
-            "-XX:+UnlockCommercialFeatures",
-            "-XX:+UseAppCDS",
-            "-XX:+UnlockDiagnosticVMOptions",
             "-cp", classpath,
             "-XX:ExtraSharedClassListFile=" + classlist,
             "-XX:SharedArchiveFile=" + archive,