diff --git a/patches/server/Add-StructuresLocateEvent.patch b/patches/server/Add-StructuresLocateEvent.patch
index ef55a92b58..bb6c012045 100644
--- a/patches/server/Add-StructuresLocateEvent.patch
+++ b/patches/server/Add-StructuresLocateEvent.patch
@@ -159,7 +159,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        for (Structure feature : structureRegistry) {
 +            final ResourceLocation key = structureRegistry.getKey(feature);
 +            assertNotNull("Missing built-in registry key", key);
-+            if (key.equals(BuiltinStructures.ANCIENT_CITY.location())) {
++            if (key.equals(BuiltinStructures.ANCIENT_CITY.location()) || key.equals(BuiltinStructures.TRAIL_RUINS.location())) {
 +                continue; // TODO remove when upstream adds "jigsaw" StructureType
 +            }
 +            if (DEFAULT_CONFIGURED_STRUCTURES.get(CraftNamespacedKey.fromMinecraft(key)) == null) {
diff --git a/patches/server/Fix-upstreams-block-state-factories.patch b/patches/server/Fix-upstreams-block-state-factories.patch
index 3570042d58..45b31072c9 100644
--- a/patches/server/Fix-upstreams-block-state-factories.patch
+++ b/patches/server/Fix-upstreams-block-state-factories.patch
@@ -402,15 +402,25 @@ diff --git a/src/test/java/org/bukkit/craftbukkit/block/BlockStateTest.java b/sr
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/test/java/org/bukkit/craftbukkit/block/BlockStateTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/block/BlockStateTest.java
+@@ -0,0 +0,0 @@ import net.minecraft.core.registries.BuiltInRegistries;
+ import net.minecraft.world.level.block.Block;
+ import net.minecraft.world.level.block.EntityBlock;
+ import net.minecraft.world.level.block.entity.BlockEntity;
++import net.minecraft.world.level.block.entity.BlockEntityType;
+ import org.bukkit.Material;
+ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+ import org.bukkit.support.AbstractTestingBase;
 @@ -0,0 +0,0 @@ public class BlockStateTest extends AbstractTestingBase {
              }
          }
      }
 +
++    // Paper start
 +    @Test
 +    public void testBlockEntityTypes() {
 +        for (var blockEntityType : BuiltInRegistries.BLOCK_ENTITY_TYPE) {
 +            org.junit.Assert.assertNotNull(CraftBlockStates.getBlockStateType(blockEntityType));
 +        }
 +    }
++    // Paper end
  }