--- old/test/hotspot/jtreg/runtime/appcds/TestCommon.java	2018-04-24 20:05:15.392519120 -0400
+++ new/test/hotspot/jtreg/runtime/appcds/TestCommon.java	2018-04-24 20:05:14.060442424 -0400
@@ -110,17 +110,9 @@
     }
 
     // If you use -XX:+UseAppCDS or -XX:-UseAppCDS in your JVM command-line, call this method
-    // to wrap the arguments. On commercial builds, -XX:+UnlockCommercialFeatures will be
-    // prepended to the command-line. See JDK-8193664.
+    // to wrap the arguments.
     public static String[] makeCommandLineForAppCDS(String... args) throws Exception {
-        if (BuildHelper.isCommercialBuild()) {
-            String[] newArgs = new String[args.length + 1];
-            newArgs[0] = "-XX:+UnlockCommercialFeatures";
-            System.arraycopy(args, 0, newArgs, 1, args.length);
-            return newArgs;
-        } else {
-            return args;
-        }
+        return args;
     }
 
     // Create AppCDS archive using appcds options