diff --git a/.gitignore b/.gitignore
index d14ce5a..afabbd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +1,15 @@
 eclipse-*-src.tar.bz2
 *.rpm
-eclipse-build-db208c33d1a67591d17b02148ae7948fd178a80d.tar.xz
-eclipse-build-eb76edf3fb5bbeb115c59d1b076f4821a6d47d74.tar.xz
-eclipse-3.8.0-M4c-src.tar.bz2
-eclipse-build-c7f168527c3ed0495e614dd21244285a57ca6e5c.tar.xz
-eclipse-build-90f6aec69b933e8e96d5e740b0151d3645a12529.tar.xz
-eclipse-3.8.0-M5-src.tar.bz2
-eclipse-build-0316c8034d15e2c083090fa759677166a76c8755.tar.xz
-eclipse-3.8.0-I20120207-0800-src.tar.bz2
-eclipse-build-34f1eef37f75faf19c8951c8351483e7a98467e9.tar.xz
-eclipse-build-f58835e3e02b0416d746bc17299acd628a72e506.tar.xz
-eclipse-3.8.0-I20120306-0800-src.tar.bz2
-eclipse-build-85830ed757416af1ca59aa1c43dce00791d12241.tar.xz
-eclipse-3.8.0-I20120314-1800-src.tar.bz2
-eclipse-build-2c0f2ac34e3aee110187aa1dea28430bec724bdb.tar.xz
+eclipse-build-*.tar.gz
+eclipse-3.8.0-*-src.tar.bz2
 eclipse-4.2.0-I20120405-1114-src.tar.bz2
-eclipse-build-5b8ee4c44320ee145596a3ce98fef1aa199055dd.tar.xz
-eclipse-build-6df9efbd645d64284c969e9775d51be63fec7627.tar.xz
-eclipse-build-bbaaeebc6916cc28848e3f7f8f2ae5b8390c2ee3.tar.xz
 /R4_platform-aggregator-*
 /eclipse-source.tar.bz2
 /eclipse-jdtpdeupdatesite.tar.bz2
 /x86_64
 /org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
-/eclipse-build-621c5c36be5ab2d5f36b2b1434164532b74f779f.tar.xz
 /results_eclipse
-/eclipse-build-06227d455145aad68156ca408ce96a26beae4714.tar.xz
-/eclipse-build-264db10bec789532541d16baaa8889e4db52298d.tar.xz
-/eclipse-build-094a56b8b1222d3535f5dada20290dc91f14d102.tar.xz
-/eclipse-build-7a327b17de5f606f47cba6b74e64619520186b7a.tar.xz
-/eclipse-build-230c37bac956247bea294e96d886a87ffb735bbd.tar.xz
-/eclipse-build-67b7e967b0c63db29a7a62cd747f3fa9217f8ff9.tar.xz
-/eclipse-build-26ca46c89997ffd16c25ee54f01312b39e58094b.tar.xz
-/eclipse-build-6b87956a336ea648fcd4e420eea0ce578e76e3d1.tar.xz
-/eclipse-build-5d6f586d503faf96dc0397915882dbd9ca180b7e.tar.xz
-/eclipse-build-c95d70019836e224cf70a7f887d0f49f18af6b8a.tar.xz
-/eclipse-build-817d2af850a3fc1769672fe63f9bd9e647029b67.tar.xz
-/eclipse-build-e8d22ec9a71e8345829f67eae1f83edba4091bac.tar.xz
-/eclipse-build-3f54ce82ff1310076f964b1ba41cc98888fb1f5e.tar.xz
-/eclipse-build-d6063a02c1c32de4b1a262ba8a8da02bed578524.tar.xz
-/eclipse-build-10c860962dcb748ecbdf92140f1d4f64511f0a88.tar.xz
-/eclipse-build-1000a3a78bc1685a00faf9ebfa9cc4dbf530d3e0.tar.xz
-/eclipse-build-62df1461d353e168d9cd713385bbe27b7ea66f4b.tar.xz
 /.m2
 /.xmvn
 /R4_platform-aggregator-2caa8794a57a9479ad642d7f6e3607a020aa36e0.tar.bz2
-/eclipse-build-b963e34cbd5ead603a051b7d4b79fc91114ccd87.tar.xz
-/eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
+/testbundle-to-eclipse-test-799cfaa9dea173f10b2ec8eecedfa60f33a26498.tar.xz
diff --git a/eclipse.spec b/eclipse.spec
index 38c7933..d560020 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -10,6 +10,7 @@ Epoch:                  1
 %global eclipse_micro   1
 %global initialize      1
 %global eb_commit       60a5a559fd746d946d869720c889bc698d9e6ab3
+%global tb_commit       799cfaa9dea173f10b2ec8eecedfa60f33a26498
 %global eclipse_tag     R4_3_1
 %global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
 %global installation_loc %{_libdir}/%{pkg_name}
@@ -51,7 +52,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -59,6 +60,8 @@ URL:            http://www.eclipse.org/
 Source0:        R4_platform-aggregator-%{eclipse_tag}.tar.xz
 #http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
 Source1:        eclipse-build-%{eb_commit}.tar.xz
+# http://fedorapeople.org/cgit/rgrunber/public_git/testbundle-to-eclipse-test.git/snapshot/testbundle-to-eclipse-test-799cfaa9dea173f10b2ec8eecedfa60f33a26498.tar.xz
+Source2:        testbundle-to-eclipse-test-%{tb_commit}.tar.xz
 
 # -com.sun.el
 # +javax.el
@@ -742,6 +745,26 @@ echo 'echo "results in /tmp/eclipse-tests-directory/results/"' >>  $RPM_BUILD_RO
 echo 'export testslocation="%{_javadir}/eclipse-testing/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
 echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{eclipse_arch} ; popd;" >>  $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
 
+# Package testbundle-to-eclipse-test
+mkdir -p $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
+
+pushd $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
+tar --strip-components=1 -xf %{SOURCE2}
+
+# Set the proper paths for scripts
+sed -i 's|\.\+/\(gatherBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepRuntimeLocation.sh
+sed -i 's|\.\+/\(genRepo\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' prepAllTestBundles.sh
+sed -i 's|\.\+/\(prepRuntimeLocation\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' %{pkg_name}-runTestBundles
+sed -i 's|\.\+/\(prepAllTestBundles\.sh\)|%{_javadir}/eclipse-testing/testbundle/\1|' %{pkg_name}-runTestBundles
+sed -i 's|cp swtbot-library.xml alltest.xml updateTestBundleXML.sh target/|cp %{_javadir}/eclipse-testing/testbundle/{swtbot-library.xml,alltest.xml,updateTestBundleXML.sh} target/|' prepRuntimeLocation.sh
+
+for file in genRepo.sh gatherBundles.sh ;do
+  sed -i '/prefix=\$ROOT_PREFIX/ i ROOT_PREFIX=%{_scl_root}' ${file}
+done
+
+mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/%{pkg_name}-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runTestBundles
+popd
+
 
 %post platform
 touch --no-create %{_datadir}/icons/hicolor
@@ -994,6 +1017,7 @@ fi
 
 %files tests
 %{_bindir}/%{pkg_name}-runEclipsePackageTests
+%{_bindir}/%{pkg_name}-runTestBundles
 %{_javadir}/%{pkg_name}-testing
 
 %files equinox-osgi -f .mfiles-equinox-osgi
@@ -1004,6 +1028,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu Oct 10 2013 Roland Grunberg <rgrunber@redhat.com> - 1:4.3.1-2
+- Add testbundle-to-eclipse-test script.
+
 * Mon Sep 30 2013 Krzysztof Daniel <kdaniel@redhat.com> 1:4.3.1-1
 - Update to 4.3.1.
 
diff --git a/sources b/sources
index 612e195..e1b84c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 0408d6c5f1808b963f4981fda8123b3a  R4_platform-aggregator-R4_3_1.tar.xz
 23f433f7a884c8029fe903cd1e70a8d7  eclipse-build-60a5a559fd746d946d869720c889bc698d9e6ab3.tar.xz
+6e9da29a7df523277fc132c8bfaf512a  testbundle-to-eclipse-test-799cfaa9dea173f10b2ec8eecedfa60f33a26498.tar.xz