--- old/test/lib/jdk/test/lib/cds/CDSTestUtils.java	2018-04-24 20:05:27.461213993 -0400
+++ new/test/lib/jdk/test/lib/cds/CDSTestUtils.java	2018-04-24 20:05:26.109136145 -0400
@@ -247,7 +247,6 @@
 
         cmd.add("-Xshare:dump");
         cmd.add("-Xlog:cds,cds+hashtables");
-        cmd.add("-XX:+UnlockDiagnosticVMOptions");
         if (opts.archiveName == null)
             opts.archiveName = getDefaultArchiveName();
         cmd.add("-XX:SharedArchiveFile=./" + opts.archiveName);
@@ -385,7 +384,6 @@
         for (String p : opts.prefix) cmd.add(p);
 
         cmd.add("-Xshare:" + opts.xShareMode);
-        cmd.add("-XX:+UnlockDiagnosticVMOptions");
         cmd.add("-Dtest.timeout.factor=" + TestTimeoutFactor);
 
         if (opts.archiveName == null)