diff --git a/.github/workflows/cross-environment-tests.yml b/.github/workflows/cross-environment-tests.yml
index 9f98e7766..3bc9741c4 100644
--- a/.github/workflows/cross-environment-tests.yml
+++ b/.github/workflows/cross-environment-tests.yml
@@ -64,9 +64,6 @@ jobs:
   test-rn-ios:
     timeout-minutes: 60
     runs-on: macos-latest
-    defaults:
-      run:
-        working-directory: ./tests/reactnative
 
     steps:
       - name: Checkout web5-js
@@ -117,7 +114,7 @@ jobs:
             ${{ runner.os }}-pods-
 
       - name: Install CocoaPods
-        run: NO_FLIPPER=1 cd bundler-bonanza/ios && pod install
+        run: cd bundler-bonanza/tests/reactnative/ios && NO_FLIPPER=1 pod install
 
       - name: Save CocoaPods
         uses: actions/cache/save@v3
@@ -147,7 +144,7 @@ jobs:
           key: ${{ runner.os }}-detox-${{ hashFiles('bundler-bonanza/tests/reactnative/ios/Podfile.lock') }}
 
       - name: Run tests
-        run: cd bundler-bonanza && yarn test
+        run: cd bundler-bonanza/tests/reactnative && yarn test
 
       - name: Upload artifacts
         if: failure()
@@ -206,7 +203,7 @@ jobs:
           pnpm install --no-frozen-lockfile
 
       - name: Install Playwright Browsers
-        run: pnpm playwright install --with-deps
+        run: cd bundler-bonanza && pnpm playwright install --with-deps
 
       - name: Run browser tests
         run: cd bundler-bonanza && TEST_PARAMS="--project=${{ matrix.browser }} --trace=on" pnpm test:browser
@@ -227,10 +224,6 @@ jobs:
 
     runs-on: ${{ matrix.os }}
 
-    defaults:
-      run:
-        working-directory: ./bundler-bonanza/tests/electron-vite
-
     steps:
       - name: Checkout web5-js
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
@@ -260,19 +253,19 @@ jobs:
         run: |
           cd bundler-bonanza
           npm install --save ../web5-js/packages/api
-          yarn --prefer-offline
+          cd tests/electron-vite && yarn --prefer-offline
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
 
       - name: Build electron app
-        run: cd bundler-bonanza && yarn build
+        run: cd bundler-bonanza/tests/electron-vite && yarn build
 
       - name: Run electron tests
-        run: cd bundler-bonanza && yarn test --trace=on
+        run: cd bundler-bonanza/tests/electron-vite && yarn test --trace=on
         if: matrix.os != 'ubuntu-latest'
 
       - name: Run electron tests (xvfb)
-        run: cd bundler-bonanza && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test --trace=on
+        run: cd bundler-bonanza/tests/electron-vite && xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- yarn test --trace=on
         if: matrix.os == 'ubuntu-latest'
 
       - uses: actions/upload-artifact@v3