diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch
index d82833e63f..c97675f4e6 100644
--- a/Spigot-Server-Patches/0001-POM-Changes.patch
+++ b/Spigot-Server-Patches/0001-POM-Changes.patch
@@ -1,11 +1,11 @@
-From b729acf6c391a7f26a4e093724d238d56e6fa812 Mon Sep 17 00:00:00 2001
+From 4daeb84c011999face5942ce02193c4e0ba552c9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index f31825f52..6a0a02883 100644
+index c73b4b4f5..0c4398228 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -138,7 +138,7 @@ index f31825f52..6a0a02883 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -247,18 +239,6 @@
+@@ -247,23 +239,11 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.7.0</version>
@@ -157,6 +157,12 @@ index f31825f52..6a0a02883 100644
              </plugin>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-surefire-plugin</artifactId>
+-                <version>2.20.1</version>
++                <version>2.20</version> <!-- Paper - revert due to regression in some environments -->
+                 <configuration>
+                     <workingDirectory>${basedir}/target/test-server</workingDirectory>
+                     <excludes>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 index 93046379d..674096cab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
@@ -171,5 +177,5 @@ index 93046379d..674096cab 100644
  
          if (stream != null) {
 -- 
-2.14.1
+2.14.3