--- a/hotspot/test/TEST.ROOT	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/TEST.ROOT	Fri Jul 21 12:43:47 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
 # It also contains test-suite configuration information.
 
 # The list of keywords supported in this test suite
-keys=cte_test jcmd nmt regression gc stress
+keys=aot cte_test jcmd nmt regression gc stress
 
 groups=TEST.groups [closed/TEST.groups]
 

--- a/hotspot/test/compiler/aot/DeoptimizationTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/DeoptimizationTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/RecompilationTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/RecompilationTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/SharedUsageTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/SharedUsageTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2CompiledTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2InterpretedTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeDynamic2NativeTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @ignore 8132547
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2CompiledTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2InterpretedTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeInterface2NativeTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2CompiledTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2InterpretedTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeSpecial2NativeTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2CompiledTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2InterpretedTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeStatic2NativeTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2CompiledTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2InterpretedTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromAot/AotInvokeVirtual2NativeTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeDynamic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm

--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeInterface2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeSpecial2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeStatic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromCompiled/CompiledInvokeVirtual2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeDynamic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.org.objectweb.asm

--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeInterface2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeSpecial2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeStatic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromInterpreted/InterpretedInvokeVirtual2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeSpecial2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeStatic2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/calls/fromNative/NativeInvokeVirtual2AotTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/DisabledAOTWithLibraryTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @build compiler.aot.cli.DisabledAOTWithLibraryTest

--- a/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/IncorrectAOTLibraryTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/MultipleAOTLibraryTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/NonExistingAOTLibraryTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/SingleAOTLibraryTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib / /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/SingleAOTOptionTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/ClasspathOptionUnknownClassTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /testlibrary/ /test/lib
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileClassTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileDirectoryTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileJarTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/CompileModuleTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionNotExistingTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/cli/jaotc/ListOptionWrongFileTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library / /test/lib /testlibrary
  * @modules java.base/jdk.internal.misc
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/NativeOrderOutputStreamTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules jdk.aot/jdk.tools.jaotc.utils
  * @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.tools.jaotc.test.NativeOrderOutputStreamTest

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSearchTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @modules jdk.aot/jdk.tools.jaotc
  *          jdk.aot/jdk.tools.jaotc.collect
  * @run junit/othervm jdk.tools.jaotc.test.collect.ClassSearchTest

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/ClassSourceTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @modules jdk.aot/jdk.tools.jaotc
  *          jdk.aot/jdk.tools.jaotc.collect
  * @build jdk.tools.jaotc.test.collect.Utils

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/SearchPathTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @modules jdk.aot/jdk.tools.jaotc
  *          jdk.aot/jdk.tools.jaotc.collect
  *

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/directory/DirectorySourceProviderTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @modules jdk.aot/jdk.tools.jaotc
  *          jdk.aot/jdk.tools.jaotc.collect
  *          jdk.aot/jdk.tools.jaotc.collect.directory

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/jar/JarSourceProviderTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @modules jdk.aot/jdk.tools.jaotc
  *          jdk.aot/jdk.tools.jaotc.collect
  *          jdk.aot/jdk.tools.jaotc.collect.jar

--- a/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/jdk.tools.jaotc.test/src/jdk/tools/jaotc/test/collect/module/ModuleSourceProviderTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @key aot
  * @modules jdk.aot/jdk.tools.jaotc
  *          jdk.aot/jdk.tools.jaotc.collect
  *          jdk.aot/jdk.tools.jaotc.collect.module

--- a/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/verification/ClassAndLibraryNotMatchTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/verification/vmflags/NotTrackedFlagTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc

--- a/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java	Wed Jul 26 11:51:25 2017 -0700
+++ b/hotspot/test/compiler/aot/verification/vmflags/TrackedFlagTest.java	Fri Jul 21 12:43:47 2017 +0200
@@ -23,6 +23,7 @@
 
 /*
  * @test
+ * @key aot
  * @library /test/lib /
  * @requires vm.bits == "64" & (os.arch == "amd64" | os.arch == "x86_64")
  * @modules java.base/jdk.internal.misc