--- a/hotspot/test/compiler/compilercontrol/share/scenario/Executor.java	Wed Nov 25 00:40:04 2015 +0100
+++ b/hotspot/test/compiler/compilercontrol/share/scenario/Executor.java	Thu Nov 26 03:05:19 2015 +0300
@@ -47,6 +47,9 @@
     private final List<String> vmOptions;
     private final Map<Executable, State> states;
     private final List<String> jcmdCommands;
+    private final String execClass = System.getProperty("compiler."
+            + "compilercontrol.share.executor.executeClass",
+            BaseAction.class.getName());
     private OutputAnalyzer[] jcmdOutputAnalyzers;
 
     /**
@@ -77,8 +80,7 @@
      */
     public List<OutputAnalyzer> execute() {
         // Add class name that would be executed in a separate VM
-        String classCmd = BaseAction.class.getName();
-        vmOptions.add(classCmd);
+        vmOptions.add(execClass);
         OutputAnalyzer output;
         try (ServerSocket serverSocket = new ServerSocket(0)) {
             if (isValid) {