diff --git a/patches/server/Remap-fixes.patch b/patches/server/Remap-fixes.patch
index 0bd580edf6..6cf68ac0e2 100644
--- a/patches/server/Remap-fixes.patch
+++ b/patches/server/Remap-fixes.patch
@@ -143,6 +143,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          List<NamespacedKey> excessKeys = new ArrayList<>();
  
          for (Field field : clazz.getFields()) {
+diff --git a/src/test/java/org/bukkit/RegistryLoadOrderTest.java b/src/test/java/org/bukkit/RegistryLoadOrderTest.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/test/java/org/bukkit/RegistryLoadOrderTest.java
++++ b/src/test/java/org/bukkit/RegistryLoadOrderTest.java
+@@ -0,0 +0,0 @@ public class RegistryLoadOrderTest extends AbstractTestingBase {
+ 
+     private static boolean initInterface = false;
+     private static boolean initAbstract = false;
+-    private static Registry<Keyed> registry;
++    private static org.bukkit.Registry<Keyed> registry; // Paper - remap fix
+ 
+     public static Stream<Arguments> data() {
+         return Stream.of(
 diff --git a/src/test/java/org/bukkit/entity/EntityTypesTest.java b/src/test/java/org/bukkit/entity/EntityTypesTest.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/entity/EntityTypesTest.java