--- a/jdk/test/com/sun/tools/attach/TempDirTest.java	Wed Jan 21 15:06:31 2015 +0100
+++ b/jdk/test/com/sun/tools/attach/TempDirTest.java	Fri Jan 23 14:20:52 2015 +0100
@@ -120,10 +120,8 @@
     private static void launchTests(long pid, Path clientTmpDir) throws Throwable {
         final String sep = File.separator;
 
-        // Need to add jdk/lib/tools.jar to classpath.
         String classpath =
-            System.getProperty("test.class.path", "") + File.pathSeparator +
-            System.getProperty("test.jdk", ".") + sep + "lib" + sep + "tools.jar";
+            System.getProperty("test.class.path", "");
 
         String[] tmpDirArg = null;
         if (clientTmpDir != null) {