diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml
index c29af7e989..d459fc2fc2 100644
--- a/.github/workflows/bindgen.yml
+++ b/.github/workflows/bindgen.yml
@@ -125,12 +125,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        target:
-          - debian: null
-            cross: null
-            rust: null
         llvm_version: ["9.0", "16.0"]
-        main_tests: [1]
         release_build: [0, 1]
         no_default_features: [0, 1]
         # FIXME: There are no pre-built static libclang libraries, so the
@@ -147,20 +142,6 @@ jobs:
             no_default_features: 0
             feature_extra_asserts: 1
 
-          # FIXME: Seems installing multiarch packages fails:
-          #
-          #   https://github.com/rust-lang/rust-bindgen/pull/2037/checks?check_run_id=2441799333
-          #
-          # - os: ubuntu-latest
-          #   target:
-          #     debian: arm64
-          #     cross: aarch64-linux-gnu
-          #     rust: aarch64-unknown-linux-gnu
-          #   llvm_version: "16.0"
-          #   main_tests: 0
-          #   release_build: 0
-          #   feature_extra_asserts: 0
-
           # Ensure stuff works on macos too
           - os: macos-latest
             llvm_version: "16.0"
@@ -170,26 +151,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install multiarch packages
-        if: matrix.target.debian
-        run: |
-          sudo apt-get install binfmt-support qemu-user-static gcc-${{matrix.target.cross}} g++-${{matrix.target.cross}}
-          source /etc/lsb-release
-          sudo tee /etc/apt/sources.list <<EOF >/dev/null
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME main
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-updates main
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-backports main
-          deb [arch=${{matrix.target.debian}}] http://ports.ubuntu.com/ubuntu-ports/ $DISTRIB_CODENAME-security main
-          EOF
-          sudo dpkg --add-architecture ${{matrix.target.debian}}
-          sudo apt-get update
-          sudo apt-get install libc6:${{matrix.target.debian}} libstdc++6:${{matrix.target.debian}}
-
       - name: Install stable
         uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          target: ${{matrix.target.rust}}
       - name: Install libtinfo
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -202,9 +167,6 @@ jobs:
       - name: Run all the tests
         env:
           GITHUB_ACTIONS_OS: ${{matrix.os}}
-          RUST_CROSS_COMPILER: ${{matrix.target.cross}}
-          RUST_TARGET: ${{matrix.target.rust}}
-          BINDGEN_MAIN_TESTS: ${{matrix.main_tests}}
           BINDGEN_RELEASE_BUILD: ${{matrix.release_build}}
           BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}
           BINDGEN_FEATURE_EXTRA_ASSERTS: ${{matrix.feature_extra_asserts}}
diff --git a/ci/test.sh b/ci/test.sh
index 46d29484af..93bc9c2823 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -27,9 +27,6 @@ assert_no_diff() {
 
 get_cargo_args() {
   local args=""
-  if [ ! -z "$RUST_TARGET" ]; then
-    args+=" --target $RUST_TARGET"
-  fi
   if [ "$BINDGEN_RELEASE_BUILD" == "1" ]; then
     args+=" --release"
   fi
@@ -51,19 +48,13 @@ get_cargo_args() {
 
 set_llvm_env
 
-if [ ! -z "$RUST_CROSS_COMPILER" ]; then
-  export RUSTFLAGS="-C linker=${RUST_CROSS_COMPILER}-gcc"
-fi
-
 CARGO_ARGS=`get_cargo_args`
 
 # Ensure we build without warnings
 RUSTFLAGS="-Dwarnings" cargo check $CARGO_ARGS
 
-if [ "$BINDGEN_MAIN_TESTS" == "1" ]; then
-  # Run the tests
-  (cd bindgen-tests && cargo test $CARGO_ARGS)
-fi
+# Run the tests
+(cd bindgen-tests && cargo test $CARGO_ARGS)
 
 assert_no_diff