--- old/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java	2017-05-25 18:12:47.475157392 -0700
+++ new/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java	2017-05-25 18:12:47.343157398 -0700
@@ -28,6 +28,7 @@
  *          java.management
  *
  * @build sun.hotspot.WhiteBox
+ * @requires !(vm.cpu.features ~= ".*aes.*")
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -40,6 +41,7 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.cli.predicate.NotPredicate;
+import static jdk.test.lib.cli.CommandLineOptionTest.*;
 
 public class TestAESIntrinsicsOnUnsupportedConfig extends AESIntrinsicsBase {
 
@@ -48,15 +50,6 @@
     private static final String AES_NOT_AVAILABLE_MSG = "warning: AES "
             + "instructions are not available on this CPU";
 
-    /**
-     * Constructs new TestAESIntrinsicsOnUnsupportedConfig that will be
-     * executed only if AESSupportPredicate returns false
-     */
-    private TestAESIntrinsicsOnUnsupportedConfig() {
-        super(new NotPredicate(AESIntrinsicsBase.AES_SUPPORTED_PREDICATE));
-    }
-
-    @Override
     protected void runTestCases() throws Throwable {
         testUseAES();
         testUseAESIntrinsics();
@@ -110,6 +103,6 @@
     }
 
     public static void main(String args[]) throws Throwable {
-        new TestAESIntrinsicsOnUnsupportedConfig().test();
+        new TestAESIntrinsicsOnUnsupportedConfig().runTestCases();
     }
 }