Index: core/api/container/src/main/java/org/codehaus/cargo/container/property/GeneralPropertySet.java
===================================================================
--- core/api/container/src/main/java/org/codehaus/cargo/container/property/GeneralPropertySet.java	(revision 1272)
+++ core/api/container/src/main/java/org/codehaus/cargo/container/property/GeneralPropertySet.java	(working copy)
@@ -50,4 +50,10 @@
      * The port to use when communicating with this server, for example to start and stop it.
      */
     String RMI_PORT = "cargo.rmi.port";
+    
+    /**
+     * The location of the jvm to use when starting/stopping containers.
+     */
+    String JVM = "cargo.jvm";
+
 }
Index: core/api/container/src/main/java/org/codehaus/cargo/container/spi/AbstractInstalledLocalContainer.java
===================================================================
--- core/api/container/src/main/java/org/codehaus/cargo/container/spi/AbstractInstalledLocalContainer.java	(revision 1272)
+++ core/api/container/src/main/java/org/codehaus/cargo/container/spi/AbstractInstalledLocalContainer.java	(working copy)
@@ -302,6 +302,12 @@
             java.createJvmarg().setLine(jvmargs);
         }
         
+        String jvm = getConfiguration().getPropertyValue(GeneralPropertySet.JVM);
+        if (jvm != null)
+        {
+            java.setJvm(jvm + "/bin/java");
+        } 
+               
         return java;
     }
 
@@ -339,7 +345,16 @@
         // include any tools.jar file to the cp.
         if (!getJdkUtils().isOSX())
         {    
-            classpath.createPathElement().setLocation(getJdkUtils().getToolsJar());
+            String jvm = getConfiguration().getPropertyValue(GeneralPropertySet.JVM);
+            if (jvm == null)
+            {
+                classpath.createPathElement().setLocation(getJdkUtils().getToolsJar());
+            }  
+            else 
+            {
+                classpath.setLocation(new File(jvm + "/lib/tools.jar"));
+            }
+            
         }
     }
     
Index: core/api/container/src/main/java/org/codehaus/cargo/container/spi/configuration/AbstractStandaloneLocalConfigurationCapability.java
===================================================================
--- core/api/container/src/main/java/org/codehaus/cargo/container/spi/configuration/AbstractStandaloneLocalConfigurationCapability.java	(revision 1272)
+++ core/api/container/src/main/java/org/codehaus/cargo/container/spi/configuration/AbstractStandaloneLocalConfigurationCapability.java	(working copy)
@@ -43,6 +43,7 @@
         this.defaultSupportsMap.put(GeneralPropertySet.PROTOCOL, Boolean.TRUE);
         this.defaultSupportsMap.put(GeneralPropertySet.HOSTNAME, Boolean.TRUE);
         this.defaultSupportsMap.put(GeneralPropertySet.JVMARGS, Boolean.TRUE);
+        this.defaultSupportsMap.put(GeneralPropertySet.JVM, Boolean.TRUE);
 
         this.defaultSupportsMap.put(ServletPropertySet.PORT, Boolean.TRUE);
         this.defaultSupportsMap.put(ServletPropertySet.USERS, Boolean.TRUE);