diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip
index f9abb0d88f1..ae0bd9cc8f1 100644
Binary files a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip and b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test30Projects/test30_1/test30_1.zip differ
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
index 4eda3b2743d..1ed99563589 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
@@ -224,7 +224,7 @@ public class ManagedBuildTestHelper {
 			Assert.fail("Test failed on saving the ICDescriptor data: " + e.getLocalizedMessage());		}
 	}
 	
-	static public void compareBenchmarks(IProject project, IPath testDir, IPath[] files) {
+	static public boolean compareBenchmarks(IProject project, IPath testDir, IPath[] files) {
 		try {
 			project.refreshLocal(IResource.DEPTH_INFINITE, null);
 		} catch (Exception e) {
@@ -239,6 +239,7 @@ public class ManagedBuildTestHelper {
 				Assert.fail("File " + testFile.lastSegment() + " does not match its benchmark.");
 			} 
 		}
+		return true;
 	}
 
 	static public StringBuffer readContentsStripLineEnds(IProject project, IPath path) {
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject21MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject21MakefileTests.java
index 4f441781c5f..3955105bee3 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject21MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject21MakefileTests.java
@@ -134,6 +134,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 		if(projects == null || projects.length == 0)
 			return;
 				
+		boolean succeeded = true;
 		for(int i = 0; i < projects.length; i++){
 			IProject curProject = projects[i];
 			
@@ -160,14 +161,16 @@ public class ManagedProject21MakefileTests extends TestCase {
 					if (i == 0) {
 						String configName = info.getDefaultConfiguration().getName();
 						IPath buildDir = Path.fromOSString(configName);
-						ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
+						succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
 					}
 				}
 			}
 		}
 		
-		for(int i = 0; i < projects.length; i++)
-			ManagedBuildTestHelper.removeProject(projects[i].getName());
+		if (succeeded) {	//  Otherwise leave the projects around for comparison
+			for(int i = 0; i < projects.length; i++)
+				ManagedBuildTestHelper.removeProject(projects[i].getName());
+		}
 	}
 
 	private void createPathVariable(IPath tmpDir) {
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
index 62773bba7e7..4a4480467c3 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuild/core/tests/ManagedProject30MakefileTests.java
@@ -134,6 +134,7 @@ public class ManagedProject30MakefileTests extends TestCase {
 		if(projects == null || projects.length == 0)
 			return;
 				
+		boolean succeeded = true;
 		for(int i = 0; i < projects.length; i++){
 			IProject curProject = projects[i];
 			
@@ -160,14 +161,16 @@ public class ManagedProject30MakefileTests extends TestCase {
 					if (i == 0) {
 						String configName = info.getDefaultConfiguration().getName();
 						IPath buildDir = Path.fromOSString(configName);
-						ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
+						succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
 					}
 				}
 			}
 		}
 		
-		for(int i = 0; i < projects.length; i++)
-			ManagedBuildTestHelper.removeProject(projects[i].getName());
+		if (succeeded) {	//  Otherwise leave the projects around for comparison
+			for(int i = 0; i < projects.length; i++)
+				ManagedBuildTestHelper.removeProject(projects[i].getName());
+		}
 	}
 
 	private void createPathVariable(IPath tmpDir) {