diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml
index 7793a0df12..282567d338 100644
--- a/.github/workflows/ci_mac.yml
+++ b/.github/workflows/ci_mac.yml
@@ -152,8 +152,6 @@ jobs:
       run: |
         ./build/tools/before_install.sh
         mkdir -p $PWD/localbin_${{ matrix.arch }}
-        rm -r $PWD/builddir
-        mkdir -p $PWD/builddir
 
     - name: Show build environment
       run: |
@@ -166,7 +164,6 @@ jobs:
         echo
 
     - name: Configuring
-      working-directory: builddir
       run: |
         wxCONFIGURE_OPTIONS="--disable-optimise $wxCONFIGURE_FLAGS"
 
@@ -175,14 +172,15 @@ jobs:
           wxCONFIGURE_OPTIONS="--with-macosx-sdk=$sdk_path $wxCONFIGURE_OPTIONS"
         fi
 
+        ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
         if [ ${{ matrix.use_asan }} ]; then
           wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
           wxASAN_CXXFLAGS=$wxASAN_CFLAGS
           wxASAN_LDFLAGS="-fsanitize=address"
 
-          ../configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
+          ./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
         else
-          ../configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
+          ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
         fi
         if [ -n "$rc" ]; then
           echo '*** Configuring failed, contents of config.log follows: ***'
@@ -193,21 +191,19 @@ jobs:
         fi
 
     - name: Building
-      working-directory: builddir
       run: |
         make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_ERROR_CXXFLAGS"
 
     - name: Building tests
-      working-directory: builddir
       run: |
         make -C tests $wxBUILD_ARGS failtest
         make -k -C tests $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
 
     - name: Testing
       if: matrix.skip_testing != true
-      working-directory: builddir/tests
+      working-directory: tests
       run: |
-        . ../../build/tools/httpbin.sh
+        . ../build/tools/httpbin.sh
         httpbin_launch
         export ASAN_OPTIONS=fast_unwind_on_malloc=0
         # Explicitly use bash because /bin/sh doesn't have pipefail option
@@ -219,7 +215,7 @@ jobs:
 
     - name: Testing GUI
       if: matrix.skip_testing != true
-      working-directory: builddir/tests
+      working-directory: tests
       run: |
         # We currently need to disable container overflow detection as we get
         # what seems to be a false positive in BitmapComboBoxTestCase triggered
@@ -232,19 +228,16 @@ jobs:
 
     - name: Building samples
       if: matrix.skip_testing != true && matrix.skip_samples != true
-      working-directory: builddir
       run: |
         make -k $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS" samples
 
     - name: Installing
       if: matrix.skip_testing != true
-      working-directory: builddir
       run: |
         make install
 
     - name: Testing installation
       if: matrix.skip_testing != true
-      working-directory: builddir
       run: |
-        make -C ../samples/minimal -f makefile.unx clean
-        make -C ../samples/minimal -f makefile.unx WX_CONFIG=${{ github.workspace }}/localbin_${{ matrix.arch }}/bin/wx-config $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"
+        make -C samples/minimal -f makefile.unx clean
+        make -C samples/minimal -f makefile.unx WX_CONFIG=${{ github.workspace }}/localbin_${{ matrix.arch }}/bin/wx-config $wxBUILD_ARGS "CXXFLAGS=$wxMAKEFILE_CXXFLAGS" "LDFLAGS=$wxMAKEFILE_LDFLAGS"