diff --git a/tycho.changes b/tycho.changes
index fd031f3..bc884f3 100644
--- a/tycho.changes
+++ b/tycho.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 17 06:17:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Conditionally apply patches for surefire depending on which
+  surefire version we are building against
+
 -------------------------------------------------------------------
 Wed Apr 10 12:05:15 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tycho.spec b/tycho.spec
index 63e86c4..5882102 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -92,7 +92,7 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-install-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-BuildRequires:  mvn(org.apache.maven.surefire:maven-surefire-common) >= 3
+BuildRequires:  mvn(org.apache.maven.surefire:maven-surefire-common)
 BuildRequires:  mvn(org.apache.maven.surefire:surefire-api)
 BuildRequires:  mvn(org.apache.maven.surefire:surefire-junit3)
 BuildRequires:  mvn(org.apache.maven.surefire:surefire-testng-utils)
@@ -221,8 +221,12 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 %patch -P 9 -p1
 %patch -P 10 -p1
 %patch -P 11 -p1
+%if %{?pkg_vcmp:%pkg_vcmp maven-surefire >= 2}%{!?pkg_vcmp:0}
 %patch -P 12 -p1
+%endif
+%if %{?pkg_vcmp:%pkg_vcmp maven-surefire >= 3}%{!?pkg_vcmp:0}
 %patch -P 13 -p1
+%endif
 %patch -P 100
 
 # Unneeded for RPM builds