diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9bdb1b5e..87b5fe7f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,34 +98,24 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        # Supported tier 3 targets without libstd support
         target: [
-          x86_64-unknown-hermit,
-          x86_64-wrs-vxworks,
           aarch64-kmc-solid_asp3,
+          aarch64-unknown-nto-qnx710,
           armv6k-nintendo-3ds,
           armv7-sony-vita-newlibeabihf,
-          aarch64-unknown-nto-qnx710,
+          i686-unknown-hurd-gnu,
+          x86_64-unknown-hermit,
+          x86_64-wrs-vxworks,
+          x86_64-unknown-dragonfly,
+          x86_64-unknown-haiku,
         ]
-        # Supported tier 3 targets with libstd support
-        include:
-          - target: aarch64-unknown-nto-qnx710
-            features: ["std"]
-          - target: x86_64-unknown-openbsd
-            features: ["std"]
-          - target: x86_64-unknown-dragonfly
-            features: ["std"]
-          - target: x86_64-unknown-haiku
-            features: ["std"]
-          - target: i686-unknown-hurd-gnu
-            features: ["std"]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@nightly # Required to build libcore
         with:
           components: rust-src
       - uses: Swatinem/rust-cache@v2
-      - run: cargo build -Z build-std=${{ contains(matrix.features, 'std') && 'std' || 'core'}} --target=${{ matrix.target }} --features="${{ join(matrix.features, ',') }}"
+      - run: cargo build -Z build-std=core --target=${{ matrix.target }}
 
   rdrand:
     name: RDRAND