diff --git a/0001-Disable-two-tests-in-DefaultInvokerTest.java.patch b/0001-Disable-two-tests-in-DefaultInvokerTest.java.patch
new file mode 100644
index 0000000..e011808
--- /dev/null
+++ b/0001-Disable-two-tests-in-DefaultInvokerTest.java.patch
@@ -0,0 +1,32 @@
+From a66435eab78aa47096ba91754a53eda11abaeaf6 Mon Sep 17 00:00:00 2001
+From: Markku Korkeala <markku.korkeala@haidion.com>
+Date: Wed, 3 Aug 2022 10:56:05 +0300
+Subject: [PATCH] Disable two tests in DefaultInvokerTest.java
+
+---
+ .../org/apache/maven/shared/invoker/DefaultInvokerTest.java     | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
+index a5aae00..f165d9a 100644
+--- a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
++++ b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
+@@ -37,7 +37,6 @@ import static org.junit.Assert.assertEquals;
+ public class DefaultInvokerTest
+ {
+ 
+-    @Test
+     public void testBuildShouldSucceed()
+         throws IOException, MavenInvocationException, URISyntaxException
+     {
+@@ -193,7 +192,6 @@ public class DefaultInvokerTest
+         assertEquals( 0, result.getExitCode() );
+     }
+ 
+-    @Test
+     public void testSpaceProperties()
+         throws Exception
+     {
+-- 
+2.37.1
+
diff --git a/maven-invoker.spec b/maven-invoker.spec
index 9b9fdbf..c5251d2 100644
--- a/maven-invoker.spec
+++ b/maven-invoker.spec
@@ -1,6 +1,6 @@
 Name:           maven-invoker
 Version:        3.1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Fires a maven build in a clean environment
 License:        ASL 2.0
 URL:            https://maven.apache.org/shared/maven-invoker/
@@ -11,6 +11,10 @@ Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%
 
 # Patch rejected upstream
 Patch1:         %{name}-MSHARED-279.patch
+# Disable two tests that are affected by bug in maven-surefire version 3.0.0-M6
+# https://issues.apache.org/jira/browse/SUREFIRE-2056
+# The bug is fixed in maven-surefire 3.0.0-M7.
+Patch2:         0001-Disable-two-tests-in-DefaultInvokerTest.java.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
@@ -43,7 +47,9 @@ API documentation for %{name}.
 %setup -q
 # Change line endings so patch can be applied
 sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+sed -i 's/\r$//' src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
 %patch1 -p1
+%patch2 -p1
 %pom_change_dep javax.inject:javax.inject:1  org.eclipse.sisu:org.eclipse.sisu.inject
 
 %build
@@ -60,6 +66,9 @@ sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineB
 
 
 %changelog
+* Wed Aug 03 2022 Markku Korkeala <markku.korkeala@iki.fi> - 3.1.0-6
+- Add Patch2 to disable two tests, resolves RHBZ#2113508 and RHBZ#2105374.
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild