--- old/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java	2018-04-24 20:04:33.558110457 -0400
+++ new/test/hotspot/jtreg/compiler/aot/fingerprint/CDSDumper.java	2018-04-24 20:04:31.926016486 -0400
@@ -53,9 +53,7 @@
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
             heapsize,
             "-XX:+IgnoreUnrecognizedVMOptions",
-            "-XX:+UnlockCommercialFeatures",
             "-XX:+UseAppCDS",
-            "-XX:+UnlockDiagnosticVMOptions",
             "-cp", classpath,
             "-XX:ExtraSharedClassListFile=" + classlist,
             "-XX:SharedArchiveFile=" + archive,