diff --git a/.github/workflows/sdks.yml b/.github/workflows/sdks.yml
index 4c97f16..6a45969 100644
--- a/.github/workflows/sdks.yml
+++ b/.github/workflows/sdks.yml
@@ -286,6 +286,10 @@ jobs:
       - name: Build Swift NIO package
         run: |
           cd swift-nio
+          # Disable new tests that don't compile for 32-bit ARM yet
+          if ${{ matrix.arch == 'armv7' }}; then
+            rm Tests/NIOCoreTests/ByteBufferQUICBinaryEncodingStrategyTests.swift
+          fi
           git apply ../sdk-config/swift-nio-disable-ecn-tests.patch ../sdk-config/swift-nio-filesystem.patch ../sdk-config/swift-nio-ndk27.patch
           ${TOOLCHAIN}/bin/swift package update
           cd .build/checkouts/
diff --git a/get-packages-and-swift-source.swift b/get-packages-and-swift-source.swift
index 38c7797..688aa3a 100644
--- a/get-packages-and-swift-source.swift
+++ b/get-packages-and-swift-source.swift
@@ -212,6 +212,9 @@ if !fmd.fileExists(atPath: sdkPath) {
   try fmd.removeItem(atPath: sdkPath.appendingPathComponent("usr/bin/curl-config"))
   try fmd.removeItem(atPath: sdkPath.appendingPathComponent("usr/bin/xml2-config"))
   try fmd.removeItem(atPath: sdkPath.appendingPathComponent("usr/share/man"))
+  try fmd.removeItem(atPath: sdkPath.appendingPathComponent("usr/lib/ossl-modules"))
+  try fmd.removeItem(atPath: sdkPath.appendingPathComponent("usr/lib/engines-3"))
+  try fmd.removeItem(atPath: sdkPath.appendingPathComponent("usr/etc"))
 }
 
 _ = runCommand("patchelf", with: ["--set-rpath", "$ORIGIN",