diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
index 7e643eb814b..c59788f7cf0 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/language/settings/providers/tests/BuiltinSpecsDetectorTest.java
@@ -851,6 +851,10 @@ public void testAbstractBuiltinSpecsDetector_EnvChangesGlobal() throws Exception
 		assertEquals(true, provider.isExecuted());
 		assertEquals(ENV_SAMPLE_VALUE_2, provider.getSampleEnvVar());
 
+		// clean up
+		vars.deleteAll();
+		fUserSupplier.setWorkspaceEnvironment(vars);
+
 		// unregister listeners
 		provider.unregisterListener();
 	}
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java
index dbe9223c266..59278a6d6f2 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/projectmodel/tests/CProjectDescriptionSerializationTests.java
@@ -202,7 +202,6 @@ public void testPersistentProperties() throws Exception {
 			coreModel.setProjectDescription(project, des);
 			Assert.assertEquals(project, des.getProject());
 
-			Thread.sleep(1000); // let scanner discovery participate
 			try {
 				QualifiedName pdomName = new QualifiedName(CCorePlugin.PLUGIN_ID, "pdomName");
 				QualifiedName activeCfg = new QualifiedName(CCorePlugin.PLUGIN_ID, "activeConfiguration");
@@ -210,6 +209,13 @@ public void testPersistentProperties() throws Exception {
 				QualifiedName discoveredScannerConfigFileName = new QualifiedName(MakeCorePlugin.PLUGIN_ID,
 						"discoveredScannerConfigFileName");
 
+				// pdomName is set by indexer setup, which may still be postponed or not even
+				// scheduled yet, so we can't join the job. Just wait for the property to appear.
+				// (The other properties were set synchronously in setProjectDescription().)
+				for (int i = 0; i < 100 && !project.getPersistentProperties().containsKey(pdomName); i++) {
+					Thread.sleep(100);
+				}
+
 				assertTrue("pdomName", project.getPersistentProperties().containsKey(pdomName));
 				assertTrue("activeCfg", project.getPersistentProperties().containsKey(activeCfg));
 				assertTrue("discoveredScannerConfigFileName",