diff --git a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
index 2bd665a..7397909 100644
--- a/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.compiler/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.tests.compiler;singleton:=true
-Bundle-Version: 3.9.2
+Bundle-Version: 3.9.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jdt.core.tests.compiler.parser,
diff --git a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
index 2da35b8..37b22ef 100644
--- a/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.core.tests.model/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.core.tests.model;singleton:=true
-Bundle-Version: 3.9.2
+Bundle-Version: 3.9.2.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jdt.core.tests,
diff --git a/releng/build-scripts/build/build.xml b/releng/build-scripts/build/build.xml
index c66d1fc..c78c7fd 100644
--- a/releng/build-scripts/build/build.xml
+++ b/releng/build-scripts/build/build.xml
@@ -56,7 +56,7 @@
 
 		<!--run the pde-build for the specified ${builder} (OT-Compiler or OTDT-Build) -->
 		<ant antfile="build.xml" dir="${baseLocation}/${run.eclipseScriptDir}" />
-		
+
 	</target>
 	
 	<target name="create.label.properties" unless="label.properties.exists">
@@ -85,6 +85,14 @@
 			</echo>
 
 			<available file="${buildDirectory}/label.properties" property="label.properties.exists" />
+
+			<!-- ======== Insert SDK build qualifier and current qualifier into our configuration file: ======== -->
+			<copy file="${OTScriptDir}/test.properties.in" tofile="${OTScriptDir}/test.properties">
+				<filterset>
+					<filter token="SDK_QUALIFIER" value="${eclipse.sdk.qualifier}"/>
+					<filter token="QUALIFIER" value="${timestamp}"/>
+				</filterset>
+			</copy>
 		</target>
 
 </project>
diff --git a/releng/build-scripts/build/run.xml b/releng/build-scripts/build/run.xml
index ed00d8f..ae4600d 100644
--- a/releng/build-scripts/build/run.xml
+++ b/releng/build-scripts/build/run.xml
@@ -69,11 +69,7 @@
 				<filter token="SDK_QUALIFIER" value="${eclipse.sdk.qualifier}"/>
 			</filterset>
 		</copy>
-		<copy file="${OTScriptDir}/test.properties.in" tofile="${OTScriptDir}/test.properties">
-			<filterset>
-				<filter token="SDK_QUALIFIER" value="${eclipse.sdk.qualifier}"/>
-			</filterset>
-		</copy>
+		<!-- Note: test.properites.in is now processed in build.xml:create.label.properties -->
 
 		<!-- versions of test plugins: -->
 		<loadproperties srcfile="${_toplevelDir}/test.properties" />
@@ -244,6 +240,7 @@
 	            <arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
 	            <arg value="-DmapVersionTag=${mapVersionTag}"/>
 		    	<arg value="-Dmap.file.path=${map.file.path}"/>
+				<arg value="-Declipse.sdk.qualifier=${eclipse.sdk.qualifier}"/>
 	            <arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
 	            <arg value="-Declipse.tests.zip=${eclipse.tests.zip}"/>
 	            <!--arg value="-verbose" /-->
@@ -321,6 +318,7 @@
 				<arg value="-Dtest.eclipseDir=${test.eclipseDir}"/>
 				<arg value="-Dmap.file.path=${map.file.path}"/>
 				<arg value="-DmapVersionTag=${mapVersionTag}"/>
+				<arg value="-Declipse.sdk.qualifier=${eclipse.sdk.qualifier}"/>
 				<arg value="-Ddo.run.tests=${do.run.tests}"/>
 				<arg value="-Ddo.build.all=${do.build.all}"/>
 				<arg value="-Declipse-app.tgz=${eclipse-app.tgz}"/>
diff --git a/releng/build-scripts/build/test.properties.in b/releng/build-scripts/build/test.properties.in
index 02d47f5..6e10853 100644
--- a/releng/build-scripts/build/test.properties.in
+++ b/releng/build-scripts/build/test.properties.in
@@ -3,14 +3,14 @@
 # ----
 org.eclipse.jdt.core.tests.builder=org.eclipse.jdt.core.tests.builder_3.8.2.@SDK_QUALIFIER@
 org.eclipse.jdt.debug.tests=org.eclipse.jdt.debug.tests_3.8.100.@SDK_QUALIFIER@
-org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.9.1
-org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.9.0
+org.eclipse.jdt.ui.tests=org.eclipse.jdt.ui.tests_3.9.1.@QUALIFIER@
+org.eclipse.jdt.ui.tests.refactoring=org.eclipse.jdt.ui.tests.refactoring_3.9.0.@QUALIFIER@
 org.eclipse.test.performance=org.eclipse.test.performance_3.7.0.@SDK_QUALIFIER@
 # ----
 
-# tests referenced without version qualifier:
-org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.9.2
-org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.9.2
+# tests with OT modifications:
+org.eclipse.jdt.core.tests.compiler=org.eclipse.jdt.core.tests.compiler_3.9.2.@QUALIFIER@
+org.eclipse.jdt.core.tests.model=org.eclipse.jdt.core.tests.model_3.9.2.@QUALIFIER@
 
 org.eclipse.objectteams.otdt.tests=org.eclipse.objectteams.otdt.tests_2.0.0
 org.eclipse.objectteams.otdt.ui.tests=org.eclipse.objectteams.otdt.ui.tests_2.0.0