diff --git a/.bazelrc b/.bazelrc
index 68ba9d26595..228cd3b1958 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -3,7 +3,7 @@ build --verbose_failures
 build --build_tag_filters=-off-by-default
 
 # Enable webgpu
-common --//src/workerd/io:enable_experimental_webgpu=True
+build --//src/workerd/io:enable_experimental_webgpu=True
 
 # Our dependencies (ICU, zlib, etc.) produce a lot of these warnings, so we disable them.
 build --per_file_copt='external/com_googlesource_chromium_icu@-Wno-ambiguous-reversed-operator,-Wno-deprecated-declarations'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0ea032ba95f..9f92169a39b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -77,8 +77,10 @@ jobs:
         run: |
             bazelisk build --disk_cache=~/bazel-disk-cache --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev --verbose_failures //...
       - name: Bazel tests
+        # Run tests and check that there are no .bazelrc issues that prevent shutdown.
         run: |
             bazelisk test --disk_cache=~/bazel-disk-cache --remote_cache=https://bazel:${{ secrets.BAZEL_CACHE_KEY }}@bazel-remote-cache.devprod.cloudflare.dev --verbose_failures --keep_going --test_output=errors //...
+            bazelisk shutdown
       - name: Report disk usage
         if: always()
         shell: bash