--- a/jdk/test/com/sun/tools/attach/BasicTests.java	Wed Jan 21 15:06:31 2015 +0100
+++ b/jdk/test/com/sun/tools/attach/BasicTests.java	Fri Jan 23 14:20:52 2015 +0100
@@ -80,8 +80,7 @@
 
         // 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 testClassDir = System.getProperty("test.classes", "") + sep;
 
         // Argumenta : -classpath cp BasicTests$TestMain pid agent badagent redefineagent