diff --git a/tycho.spec b/tycho.spec
index 44a3946..dccffd5 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -28,7 +28,7 @@
 
 Name:           tycho
 Version:        1.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 # license file is missing but all files having some licensing information are ASL 2.0
@@ -109,7 +109,6 @@ BuildRequires:  mvn(org.fedoraproject.xmvn:xmvn-core)
 BuildRequires:  mvn(org.fedoraproject.xmvn:xmvn-install)
 BuildRequires:  mvn(org.fedoraproject.xmvn:xmvn-parent:pom:)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
-BuildRequires:  mvn(org.mockito:mockito-core)
 BuildRequires:  mvn(org.ow2.asm:asm-tree)
 BuildRequires:  mvn(org.ow2.asm:asm-util)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
@@ -189,16 +188,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%if 0%{?rhel} || 0%{?fedora} >= 30
 %patch5 -p1
-%else
-# Fixup mockito compatibility
-sed -i -e 's/org\.hamcrest/org.hamcrest.core/' tycho-bundles/pom.xml
-sed -i -e 's/org\.mockito/org.mockito.mockito-core/' \
-  tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF \
-  tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF \
-  tycho-bundles/org.eclipse.tycho.p2.resolver.shared.tests/META-INF/MANIFEST.MF
-%endif
 
 # Unneeded for RPM builds
 %pom_remove_plugin :maven-site-plugin
@@ -236,6 +226,13 @@ done
 # Use tycho-testing-harness from the reactor
 sed -i -e '/tycho-testing-harness/a<version>${project.version}</version>' tycho-surefire/tycho-surefire-plugin/pom.xml
 
+# Don't build tests
+for b in core.shared.tests p2.resolver.impl.test p2.resolver.shared.tests p2.maven.repository.tests p2.tools.tests test.utils ; do
+  %pom_disable_module org.eclipse.tycho.$b tycho-bundles
+done
+%pom_disable_module org.fedoraproject.p2.tests fedoraproject-p2
+%pom_remove_dep -r :::test
+
 # Bootstrap Build
 %if %{with bootstrap}
 
@@ -243,13 +240,6 @@ sed -i -e '/tycho-testing-harness/a<version>${project.version}</version>' tycho-
 %pom_xpath_remove "pom:compilerId" tycho-lib-detector
 %pom_remove_dep "org.eclipse.tycho:tycho-compiler-jdt" tycho-lib-detector
 
-# Don't build tests when bootstrapping
-for b in core.shared.tests p2.resolver.impl.test p2.resolver.shared.tests p2.maven.repository.tests p2.tools.tests test.utils ; do
-  %pom_disable_module org.eclipse.tycho.$b tycho-bundles
-done
-%pom_disable_module org.fedoraproject.p2.tests fedoraproject-p2
-%pom_remove_dep -r :::test
-
 # Unpack a compatible version of Eclipse we can use to build against
 tar -xf %{SOURCE10}
 # Install OSGi bundles into local repo to override any incompatible system version
@@ -326,8 +316,6 @@ sed -i -e 's|type>eclipse.*<|type>jar<|' .xmvn-reactor
 
 # Don't package target platform definition files
 %mvn_package "::target::" __noinstall
-# Don't package fp-p2 tests
-%mvn_package ":org.fedoraproject.p2.tests" __noinstall
 
 %install
 # Get debundling scripts
@@ -411,6 +399,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{xmvn_libdir}/inst
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue May 07 2019 Mat Booth <mat.booth@redhat.com> - 1.3.0-5
+- Don't build tests, they are not being run anyway
+
 * Mon Mar 11 2019 Mat Booth <mat.booth@redhat.com> - 1.3.0-4
 - Debootstrap build
 - Restrict to the same architectures as Eclipse itself