--- a/hotspot/src/share/vm/runtime/arguments.cpp	Thu Apr 27 21:16:33 2017 +0000
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Fri Apr 28 02:54:05 2017 -0700
@@ -2515,6 +2515,9 @@
   status = status && check_jvmci_args_consistency();
 
   if (EnableJVMCI) {
+    PropertyList_unique_add(&_system_properties, "jdk.internal.vm.ci.enabled", "true",
+        AddProperty, UnwriteableProperty, InternalProperty);
+
     if (!ScavengeRootsInCode) {
       warning("forcing ScavengeRootsInCode non-zero because JVMCI is enabled");
       ScavengeRootsInCode = 1;