diff -r 0cc9f5028562 -r a4efe145313d hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java
--- a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java	Thu Jun 16 13:34:32 2016 -0400
+++ b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java	Fri Jun 17 13:07:27 2016 +0300
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8136421
- * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9" | os.simpleArch == "aarch64")
+ * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
  * @library /testlibrary /
  * @modules java.base/jdk.internal.misc
  * @modules jdk.vm.ci/jdk.vm.ci.hotspot