diff -r 24ef5fb05e0f -r 8bf6338972ce test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java
--- a/test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java	Fri Mar 29 13:49:37 2013 -0700
+++ b/test/gc/metaspace/ClassMetaspaceSizeInJmapHeap.java	Sat Mar 23 09:16:37 2013 +0100
@@ -39,8 +39,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);
+        JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
+                                              .addToolArg("-heap")
+                                              .addToolArg(pid);
+        ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
 
         File out = new File("ClassMetaspaceSizeInJmapHeap.stdout.txt");
         pb.redirectOutput(out);