diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 26976ad..841da1b 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -1,5 +1,5 @@
---- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2017-03-06 14:35:07.000000000 +0000
-+++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2017-03-07 15:30:44.993586317 +0000
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml.orig	2017-04-19 12:47:51.000000000 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml	2017-04-19 20:15:38.781348810 +0100
 @@ -39,21 +39,6 @@
          arg1="${testPlugin}"
          arg2="org.eclipse.equinox.p2.tests.discovery" />
@@ -112,10 +112,30 @@
      <echo message="current.build.repo: ${current.build.repo}" />
  
  
-@@ -2017,6 +1990,15 @@
+@@ -1902,6 +1875,7 @@
+     -->
      <antcall target="quickTests" />
      <antcall target="longRunningTests" />
++    <antcall target="mergeAllTestResults" />
  
+   </target>
+ 
+@@ -1963,6 +1937,8 @@
+     <antcall target="jdttext" />
+     <antcall target="jdtuirefactoring" />
+   </target>
++  <target name="distroCustomTests" depends="init">
++  </target>
+   <target
+     name="quickTests"
+     depends="init">
+@@ -2072,6 +2048,20 @@
+ 
+   </target>
+ 
++  <target
++    name="mergeAllTestResults"
++    depends="init">
 +    <!-- Split XML into individual test suites for generating an aggregate report -->
 +    <mkdir dir="${results}/split-xml" />
 +    <xslt style="${executionDir}/splitter.xsl" basedir="${results}/xml" includes="*.xml" destdir="${results}/split-xml"/>
@@ -125,10 +145,12 @@
 +    </junitreport>
 +    <!-- Generate top-level HTML report -->
 +    <xslt style="${executionDir}/JUNIT.XSL" basedir="${results}/xml" includes="org.eclipse.sdk.tests.xml" destdir="${results}/html" />
-   </target>
- 
-   <!-- This and all the performance specific targets
-@@ -2194,8 +2176,6 @@
++  </target>
++
+   <!--
+     admittedly, not quite all of 'platform', but for
+     now serves dual purpose of a "short set" of tests, that area
+@@ -2080,8 +2070,6 @@
    <target
      name="platform"
      depends="init">
@@ -137,7 +159,7 @@
  
      <antcall target="ant" />
      <antcall target="antui" />
-@@ -2227,7 +2207,6 @@
+@@ -2114,7 +2102,6 @@
      <antcall target="e4CssSwt" />
      <antcall target="e4UI" />
      <antcall target="equinoxds" />
@@ -145,7 +167,7 @@
      <antcall target="bidi" />
      <antcall target="ltkuirefactoringtests" />
      <antcall target="ltkcorerefactoringtests" />
-@@ -2243,7 +2222,6 @@
+@@ -2130,7 +2117,6 @@
      <antcall target="osgi" />
      <antcall target="coreresources" />
      <antcall target="equinoxp2" />
@@ -224,3 +246,57 @@
  
 -
 +cleanupXvnc
+--- eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml.orig	2017-04-19 19:39:39.382960089 +0100
++++ eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml	2017-04-19 20:04:36.088575077 +0100
+@@ -137,6 +137,15 @@
+         <property
+             name="formatter"
+             value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter" />
++        <!-- default product/application to launch -->
++        <condition property="testproduct.if.available" value="-product ${testProduct}">
++            <isset property="testProduct" />
++        </condition>
++        <property name="testproduct.if.available" value="" />
++        <condition property="testapplication.if.available" value="-testApplication ${testApplication}">
++            <isset property="testApplication" />
++        </condition>
++        <property name="testapplication.if.available" value="" />
+ 
+         <tstamp prefix="NOW" />
+         <property
+@@ -196,6 +205,17 @@
+     </target>
+ 
+     <target
++        name="swtbot-test"
++        description="Eclipse application used to launch SWTBOT plugin tests."
++        depends="init">
++        <antcall target="${launchTarget}">
++            <param
++                name="application"
++                value="org.eclipse.swtbot.eclipse.junit.headless.swtbottestapplication" />
++        </antcall>
++    </target>
++
++    <target
+         name="java-test"
+         depends="init">
+         <echo
+@@ -258,7 +278,7 @@
+                     <include name="org.eclipse.equinox.launcher_*.jar" />
+                 </fileset>
+             </classpath>
+-            <arg line="-application ${application}" />
++            <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
+             <arg line="-data ${data-dir}" />
+             <arg line="formatter=${formatter},${test-output}" />
+             <arg line="-testPluginName ${plugin-name}" />
+@@ -329,7 +349,7 @@
+             output="${junit-report-output}/${classname}.txt">
+             <arg line="-data ${data-dir}" />
+             <arg line="${test-vm}" />
+-            <arg line="-application ${application}" />
++            <arg line="-application ${application} ${testproduct.if.available} ${testapplication.if.available}" />
+             <arg line="formatter=${formatter},${test-output}" />
+             <arg line="-testPluginName ${plugin-name}" />
+             <arg line="-className ${classname}" />
diff --git a/eclipse.spec b/eclipse.spec
index f13d1e0..bf070c3 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,11 +1,11 @@
 # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
 # generation and docs will not be built and a second run will be required, but
 # this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap       0
+%global bootstrap       1
 
 Epoch:                  1
 
-%global eb_commit       4bb6dae1336990aa3fe29be55f99869f091f6e44
+%global eb_commit       31070399d9e0224c8e6deda2ad12cfee7a70dcf3
 %global eclipse_tag     I20170417-2000
 
 %global _jetty_version  9.4.3
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.7.0
-Release:        0.2%{?dist}
+Release:        0.3%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -349,7 +349,6 @@ SWT tools, E4 tools, Rel-Eng tools and Eclipse Test frameworks.
 %package        tests
 Summary:        Eclipse Tests
 
-Requires:       %{name}-pde = %{epoch}:%{version}-%{release}
 Requires:       %{name}-contributor-tools = %{epoch}:%{version}-%{release}
 
 %description    tests
@@ -526,14 +525,6 @@ sed -i -e '/org.eclipse.ui.themes/i<plugin id="org.eclipse.jdt.core.compiler.bat
 sed -i -e '/<\/excludes>/i<plugin id="org.eclipse.jdt.core.compiler.batch"/>' \
   eclipse.platform.releng/features/org.eclipse.platform-feature/pom.xml
 
-# Don't duplicate the test framework bundles
-%pom_remove_plugin org.eclipse.tycho.extras:tycho-p2-extras-plugin \
-  eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests
-%pom_xpath_remove "includes[@id='org.eclipse.test']" \
-  eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
-sed -i -e '/org.eclipse.test/d' \
-  eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/eclipse-junit-tests.product
-
 # Remove uneeded hamcrest bundles
 %pom_xpath_remove "plugin[@id='org.hamcrest']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
 %pom_xpath_remove "plugin[@id='org.hamcrest.text']" eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
@@ -604,12 +595,14 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
 
 # The order of these mvn_package calls is important
 %mvn_package "::pom::" __noinstall
-%mvn_package ":*tests*" __noinstall
-%mvn_package ":org.eclipse.{e4.ui.workbench.addons.swt,equinox.frameworkadmin}.test" __noinstall
-%mvn_package ":*examples*" __noinstall
-%mvn_package ":org.eclipse.pde.tools.versioning" __noinstall
-%mvn_package ":org.eclipse.update.core" __noinstall
+%mvn_package ":*tests*" tests
+%mvn_package ":org.eclipse.equinox.frameworkadmin.test" tests
+%mvn_package ":org.eclipse.equinox.p2.installer" tests
+%mvn_package ":org.eclipse.jface.examples.databinding" tests
+%mvn_package ":org.eclipse.pde.tools.versioning" tests
+%mvn_package ":org.eclipse.update.core" tests
 %mvn_package "org.eclipse.test:org.eclipse.test" contributor-tools
+%mvn_package ":*examples*" __noinstall
 %mvn_package "::jar:sources{,-feature}:" sdk
 %mvn_package ":org.eclipse.jdt.doc.isv" sdk
 %mvn_package ":org.eclipse.platform.doc.isv" sdk
@@ -796,29 +789,18 @@ done
 VER=$(echo $RPM_BUILD_ROOT%{_eclipsedir}/plugins/org.eclipse.swt_*.jar | sed -e "s/.*_\(.*\)\.jar/\1/")
 %add_maven_depmap org.eclipse.swt:org.eclipse.swt:$VER swt.jar -a org.eclipse.swt:swt -f swt
 
-##############
-# Tests
-##############
-
-# Since Tycho 0.22.0 resources get copied into generated eclipse-repository.
-# We place some content in ${project.build.directory} and use that to place
-# it into some other assembled zip.
-# With 0.22.0 it will get placed also into the eclipse-repository zip.
-# Let's just exclude label.properties, and equinoxp2test.properties from
-# the second extraction to avoid the issue entirely.
-
+# Tests framework
 unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/eclipse-junit-tests-bundle.zip \
-  -d $RPM_BUILD_ROOT/%{_javadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh
-unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing -x label.properties equinoxp2tests.properties
-cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
-rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
+  -d $RPM_BUILD_ROOT/%{_datadir}/ -x eclipse-testing/runtests.bat eclipse-testing/runtestsmac.sh
+cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing
+rm $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/eclipse-junit-tests-*.zip
 
 # These properties are not correct and nested properties won't get resolved
-sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/equinoxp2tests.properties
+sed -i '/org.eclipse.equinox.p2.reconciler.test/ d' $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/equinoxp2tests.properties
 
 # Package testbundle-to-eclipse-test
-cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle
-mv $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
+cp -r testbundle-to-eclipse-test $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle
+mv $RPM_BUILD_ROOT/%{_datadir}/eclipse-testing/testbundle/eclipse-runTestBundles $RPM_BUILD_ROOT/%{_bindir}/eclipse-runTestBundles
 
 #fix so permissions
 find $RPM_BUILD_ROOT/%{_eclipsedir} -name *.so -exec chmod a+x {} \;
@@ -1036,9 +1018,9 @@ fi
 
 %files contributor-tools -f .mfiles-contributor-tools
 
-%files tests
+%files tests -f .mfiles-tests
 %{_bindir}/eclipse-runTestBundles
-%{_datadir}/java/eclipse-testing
+%{_datadir}/eclipse-testing
 
 %files equinox-osgi -f .mfiles-equinox-osgi
 %{_eclipsedir}/plugins/org.eclipse.osgi_*
@@ -1047,6 +1029,11 @@ fi
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu Apr 20 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.3
+- Simplify test installation and move machinery out of javadir now
+  that java stuff is installed in its own place
+- Enable bootstrap mode
+
 * Wed Apr 19 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.2
 - Update to latest I-build
 
diff --git a/sources b/sources
index 2c4fb8f..a010d4f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (R4_platform-aggregator-I20170417-2000.tar.xz) = d994c6043e08d259776ac2dcdf6b1d1cc9933043e45455ccabbdafdc43e6361d1c2f43c75d0e77b67d9308426513f94786f76a619b2e68458228e023977d194e
-SHA512 (org.eclipse.linuxtools.eclipse-build-4bb6dae1336990aa3fe29be55f99869f091f6e44.tar.xz) = bc2a3a8a3ef98688415b857cd751749d0529b4f28a4da58bbb3baf2da54806077021f6e1410484b416dd189479e9467a558ae991242329a5d96fa709216f2d16
+SHA512 (org.eclipse.linuxtools.eclipse-build-31070399d9e0224c8e6deda2ad12cfee7a70dcf3.tar.xz) = 1f12d0e66385c14996ff370b28098df6af8e241fb1b4e1fe18dd9f1df2ed74974be5b812b9e07ea4e3ff7f5df9d0d2bf71e8ddfb2e2aaf74b0cd5d6d84fef470