--- old/test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java	2013-03-13 22:44:14.607571762 +0100
+++ new/test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java	2013-03-13 22:44:14.543571763 +0100
@@ -30,6 +30,7 @@
  */
 
 import com.oracle.java.testlibrary.*;
+import com.oracle.java.testlibrary.gc.*;
 import java.nio.file.*;
 import java.io.File;
 import java.nio.charset.Charset;
@@ -39,8 +40,10 @@
     public static void main(String[] args) throws Exception {
         String pid = Integer.toString(ProcessTools.getProcessId());
 
-        ProcessBuilder pb = new ProcessBuilder();
-        pb.command(JDKToolFinder.getJDKTool("jmap"), "-heap",  pid);
+        JmapLauncher jmap = new JmapLauncher();
+        jmap.setJmapArguments("-heap", pid);
+
+        ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
 
         File out = new File("ClassMetaspaceSizeInJmapHeap.stdout.txt");
         pb.redirectOutput(out);