diff --git a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
index 95ac82ddbfd..065c316370e 100644
--- a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
+++ b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/OtherPatternTests.java
@@ -32,7 +32,6 @@ import org.eclipse.cdt.internal.core.search.matching.OrPattern;
 import org.eclipse.cdt.testplugin.CTestPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
 
 /**
  * @author aniefer
diff --git a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/ParseTestOnSearchFiles.java b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/ParseTestOnSearchFiles.java
index ba93fbcfa4b..64ed1688b2d 100644
--- a/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/ParseTestOnSearchFiles.java
+++ b/core/org.eclipse.cdt.core.tests/search/org/eclipse/cdt/core/search/tests/ParseTestOnSearchFiles.java
@@ -10,6 +10,7 @@
 ***********************************************************************/
 package org.eclipse.cdt.core.search.tests;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
 
@@ -35,6 +36,7 @@ public class ParseTestOnSearchFiles extends TestCase
 {
     private FileInputStream fileIn;
     private String name;
+    private String fullPathName;
     /**
      * 
      */
@@ -52,13 +54,15 @@ public class ParseTestOnSearchFiles extends TestCase
     
 	protected void setUp() throws Exception {	
 		name = "resources/search/classDecl.cpp";
-        fileIn = new FileInputStream(CTestPlugin.getDefault().getFileInPlugin(new Path(name)));
+		File f = CTestPlugin.getDefault().getFileInPlugin(new Path(name));
+		fullPathName = f.getAbsolutePath();
+        fileIn = new FileInputStream(f);
 	}
 	
 	public void testParseOfAndrewsFile() throws Exception
 	{
 		ISourceElementRequestor requestor = new NullSourceElementRequestor();
-		IScanner scanner = ParserFactory.createScanner( new InputStreamReader( fileIn ), name, new ScannerInfo(), ParserMode.COMPLETE_PARSE, ParserLanguage.CPP, requestor, new NullLogService() );
+		IScanner scanner = ParserFactory.createScanner( new InputStreamReader( fileIn ), fullPathName, new ScannerInfo(), ParserMode.COMPLETE_PARSE, ParserLanguage.CPP, requestor, new NullLogService() );
 		IParser parser = ParserFactory.createParser( scanner, requestor, ParserMode.COMPLETE_PARSE, ParserLanguage.CPP, null );
 		assertTrue( parser.parse() );
 	}