diff --git a/org.eclipse.e4.builder/builder/general/customTargets.xml b/org.eclipse.e4.builder/builder/general/customTargets.xml
index a24528b..727471f 100644
--- a/org.eclipse.e4.builder/builder/general/customTargets.xml
+++ b/org.eclipse.e4.builder/builder/general/customTargets.xml
@@ -127,6 +127,9 @@
 			<iu id="org.apache.commons.lang" />
 			<iu id="org.junit" version="0.0.0" />
 			<iu id="org.junit.source" version="0.0.0" />
+			<iu id="org.easymock" />
+			<iu id="org.jmock" />
+			<iu id="org.mockito" />
 			<iu id="javax.el" />
 		</p2.mirror>
 		
@@ -160,6 +163,16 @@
 			<iu id="org.eclipse.xtext.sdk.feature.group" />
 		</p2.mirror>
 		
+		<echo message="Mirror from ${swtbotRepoURL} to ${repoBaseLocation}/swtbot" />
+		<p2.mirror destination="file:${repoBaseLocation}/swtbot" ignoreerrors="true">
+			<source location="${swtbotRepoURL}" />
+			<slicingOptions includeOptional="false" includeNonGreedy="false" latestVersionOnly="true" />
+			<iu id="org.eclipse.swtbot.eclipse.core" />
+			<iu id="org.eclipse.swtbot.eclipse.finder" />
+			<iu id="org.eclipse.swtbot.junit4_x" />
+			<iu id="org.eclipse.swtbot.swt.finder" />
+		</p2.mirror>
+		
 		<p2.remove.iu>
 			<repository location="file:${repoBaseLocation}/xtext" />
 			<iu id="osgi.enterprise" />
diff --git a/org.eclipse.e4.builder/builder/general/tests/test.xml b/org.eclipse.e4.builder/builder/general/tests/test.xml
index 5e66e76..9ed26ec 100644
--- a/org.eclipse.e4.builder/builder/general/tests/test.xml
+++ b/org.eclipse.e4.builder/builder/general/tests/test.xml
@@ -667,6 +667,35 @@
 	<target name="coreTests">
 		<runTests testPlugin="org.eclipse.e4.core.tests" />
 	</target>
+	
+	<target name="discoveryCompatibility">
+		<runTests testPlugin="org.eclipse.platform.discovery.compatibility.tests" />
+	</target>
+	
+	<target name="discoveryCore">
+		<runTests testPlugin="org.eclipse.platform.discovery.core.test.unit" />
+	</target>
+	
+	<target name="discoveryIntegration">
+		<runTests testPlugin="org.eclipse.platform.discovery.integration.test.unit" />
+	</target>
+	
+	<target name="discoveryRuntime">
+		<runTests testPlugin="org.eclipse.platform.discovery.runtime.test.unit" />
+	</target>
+		
+		
+	<target name="discoveryUIComp">
+		<runTests testPlugin="org.eclipse.platform.discovery.ui.test.comp" />
+	</target>
+	
+	<target name="discoveryUIUnit">
+		<runTests testPlugin="org.eclipse.platform.discovery.ui.test.unit" />
+	</target>
+			
+	<target name="discoveryUtilUnit">
+		<runTests testPlugin="org.eclipse.platform.discovery.util.test.unit" />
+	</target>
 
 	<target name="e4">
 		<antcall target="coreresources" />
@@ -693,7 +722,13 @@
 		<antcall target="e4bindings" />
 		<!--antcall target="semanticResources" /-->
 		<antcall target="semanticUi" />
-		
+		<antcall target="discoveryCompatibility"/>
+		<antcall target="discoveryCore"/>
+		<antcall target="discoveryIntegration"/>
+		<antcall target="discoveryRuntime"/>
+		<antcall target="discoveryUIComp"/>
+		<antcall target="discoveryUIUnit"/>
+		<antcall target="discoveryUtilUnit"/>
 		<antcall target="cleanup" />
 	</target>
 	
diff --git a/org.eclipse.e4.builder/builder/general/update_repo.properties b/org.eclipse.e4.builder/builder/general/update_repo.properties
index 19f54dd..641a30e 100644
--- a/org.eclipse.e4.builder/builder/general/update_repo.properties
+++ b/org.eclipse.e4.builder/builder/general/update_repo.properties
@@ -30,5 +30,5 @@
 
 orbitRepoURL=http://download.eclipse.org/tools/orbit/downloads/drops/${orbitBuildId}/repository
 xtextRepoURL=http://download.eclipse.org/releases/juno
-
+swtbotRepoURL=http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site