diff --git a/.github/workflows/stockfish_binaries.yml b/.github/workflows/stockfish_binaries.yml
index 5fe67d15..f7669b47 100644
--- a/.github/workflows/stockfish_binaries.yml
+++ b/.github/workflows/stockfish_binaries.yml
@@ -42,9 +42,12 @@ jobs:
           - x86-64
           - x86-64-modern
           - x86-64-avx2
+          - x86-64-bmi2
         exclude:
           - binaries: x86-64-avx2
-            config: {os: macos-12}
+            config: { os: macos-12 }
+          - binaries: x86-64-bmi2
+            config: { os: macos-12 }
     defaults:
       run:
         working-directory: src
@@ -165,4 +168,3 @@ jobs:
           tag_name: stockfish-dev-${{ env.COMMIT_DATE }}-${{ env.COMMIT_SHA }}
           prerelease: true
           files: stockfish-${{ matrix.config.simple_name }}-${{ matrix.binaries }}.${{ matrix.config.archive_ext }}
-
diff --git a/.github/workflows/stockfish_test.yml b/.github/workflows/stockfish_test.yml
index 8a71d76b..9d6bc20c 100644
--- a/.github/workflows/stockfish_test.yml
+++ b/.github/workflows/stockfish_test.yml
@@ -134,7 +134,7 @@ jobs:
       # x86-32 tests
 
       - name: Test debug x86-32 build
-        if: ${{ matrix.config.run_32bit_tests }}
+        if: matrix.config.run_32bit_tests
         run: |
           export CXXFLAGS="-Werror -D_GLIBCXX_DEBUG"
           make clean
@@ -142,28 +142,28 @@ jobs:
           ../tests/signature.sh $benchref
 
       - name: Test x86-32 build
-        if: ${{ matrix.config.run_32bit_tests }}
+        if: matrix.config.run_32bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-32 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32-sse41-popcnt build
-        if: ${{ matrix.config.run_32bit_tests }}
+        if: matrix.config.run_32bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-32-sse41-popcnt build
           ../tests/signature.sh $benchref
 
       - name: Test x86-32-sse2 build
-        if: ${{ matrix.config.run_32bit_tests }}
+        if: matrix.config.run_32bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-32-sse2 build
           ../tests/signature.sh $benchref
 
       - name: Test general-32 build
-        if: ${{ matrix.config.run_32bit_tests }}
+        if: matrix.config.run_32bit_tests
         run: |
           make clean
           make -j2 ARCH=general-32 build
@@ -172,36 +172,50 @@ jobs:
       # x86-64 tests
 
       - name: Test debug x86-64-modern build
-        if: ${{ matrix.config.run_64bit_tests }}
+        if: matrix.config.run_64bit_tests
         run: |
           export CXXFLAGS="-Werror -D_GLIBCXX_DEBUG"
           make clean
           make -j2 ARCH=x86-64-modern optimize=no debug=yes build
           ../tests/signature.sh $benchref
 
+      - name: Test x86-64-bmi2 build
+        if: matrix.config.run_64bit_tests && runner.os != 'macOS'
+        run: |
+          make clean
+          make -j2 ARCH=x86-64-bmi2 build
+          ../tests/signature.sh $benchref
+
+      - name: Test x86-64-avx2 build
+        if: matrix.config.run_64bit_tests && runner.os != 'macOS'
+        run: |
+          make clean
+          make -j2 ARCH=x86-64-avx2 build
+          ../tests/signature.sh $benchref
+
       - name: Test x86-64-modern build
-        if: ${{ matrix.config.run_64bit_tests }}
+        if: matrix.config.run_64bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-64-modern build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-ssse3 build
-        if: ${{ matrix.config.run_64bit_tests }}
+        if: matrix.config.run_64bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-64-ssse3 build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64-sse3-popcnt build
-        if: ${{ matrix.config.run_64bit_tests }}
+        if: matrix.config.run_64bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-64-sse3-popcnt build
           ../tests/signature.sh $benchref
 
       - name: Test x86-64 build
-        if: ${{ matrix.config.run_64bit_tests }}
+        if: matrix.config.run_64bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-64 build
@@ -248,7 +262,7 @@ jobs:
       # Other tests
 
       - name: Check perft and search reproducibility
-        if: ${{ matrix.config.run_64bit_tests }}
+        if: matrix.config.run_64bit_tests
         run: |
           make clean
           make -j2 ARCH=x86-64-modern build