diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 78591f4f5..b0bc01e6f 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -172,6 +172,11 @@ jobs:
     - name: Build support library
       run: clang -c ./Library/Hylo/LibC.c -o HyloLibC.lib
 
-    - name: Build and test
-      run: swift test --pkg-config-path .
-      shell: cmd
+    - name: Build normal
+      run: swift build --verbose --pkg-config-path .
+
+    - name: Build tests
+      run: swift build --verbose --build-tests --pkg-config-path .
+
+    - name: Run tests
+      run: swift test --verbose --pkg-config-path .
diff --git a/Plugins/TestGeneratorPlugin/PortableBuildToolPlugin.swift b/Plugins/TestGeneratorPlugin/PortableBuildToolPlugin.swift
index 6b7f80177..7362fb02e 100644
--- a/Plugins/TestGeneratorPlugin/PortableBuildToolPlugin.swift
+++ b/Plugins/TestGeneratorPlugin/PortableBuildToolPlugin.swift
@@ -203,6 +203,7 @@ public extension PortableBuildCommand.Tool {
         executable: swift.spmPath,
         argumentPrefix: [
           "run",
+          "--verbose",
           // Only Macs currently use sandboxing, but nested sandboxes are prohibited, so for future
           // resilience in case Windows gets a sandbox, disable it on these reentrant builds.
           //