diff --git a/0007-Revert-change-for-surefire-update-that-is-not-in-Fed.patch b/0007-Revert-change-for-surefire-update-that-is-not-in-Fed.patch
index 0db52cc..21a6f4b 100644
--- a/0007-Revert-change-for-surefire-update-that-is-not-in-Fed.patch
+++ b/0007-Revert-change-for-surefire-update-that-is-not-in-Fed.patch
@@ -1,12 +1,46 @@
-From 350cc1936943552f928a421bed025c333106f525 Mon Sep 17 00:00:00 2001
+From d90cb4ea647623da0daab058010c454d8dc832ed Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Wed, 25 Nov 2020 10:35:26 +0000
 Subject: [PATCH 7/7] Revert change for surefire update that is not in Fedora
 
 ---
- .../tycho/surefire/osgibooter/OsgiSurefireBooter.java        | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
+ pom.xml                                                   | 2 +-
+ .../META-INF/MANIFEST.MF                                  | 8 ++++----
+ .../tycho/surefire/osgibooter/OsgiSurefireBooter.java     | 5 ++---
+ 3 files changed, 7 insertions(+), 8 deletions(-)
 
+diff --git a/pom.xml b/pom.xml
+index 89500fd2..05a0fd88 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -85,7 +85,7 @@
+ 		<pluginToolsVersion>3.6.0</pluginToolsVersion>
+ 		<maven-version>3.6.3</maven-version>
+ 		<!-- NOTE: when updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->
+-		<surefire-version>2.22.2</surefire-version>
++		<surefire-version>2.22.0</surefire-version>
+ 
+ 		<equinoxVersion>3.16.0</equinoxVersion>
+ 		<equinoxCompatVersion>1.2.100</equinoxCompatVersion>
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+index 3888be52..d9ae3dce 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+@@ -5,10 +5,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
+ Bundle-ActivationPolicy: lazy
+ Bundle-Version: 2.1.0
+ Bundle-ClassPath: .,
+- jars/surefire-booter-2.22.2.jar,
+- jars/surefire-api-2.22.2.jar,
+- jars/surefire-logger-api-2.22.2.jar,
+- jars/maven-surefire-common-2.22.2.jar
++ jars/surefire-booter-2.22.0.jar,
++ jars/surefire-api-2.22.0.jar,
++ jars/surefire-logger-api-2.22.0.jar,
++ jars/maven-surefire-common-2.22.0.jar
+ Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
 index 70be36f1..5734a440 100644
 --- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java