diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c6d93cc89..857f9989d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         run: ./configure --enable-jit --enable-pcre2-16 --enable-pcre2-32
 
       - name: Build
-        run: make -j2 CPPFLAGS='-Wall -Wextra -Werror'
+        run: make -j3 CPPFLAGS='-Wall -Wextra -Werror'
 
       - name: Test (main test script)
         run: ./RunTest
@@ -53,7 +53,7 @@ jobs:
         run: ./configure --enable-jit --enable-pcre2-16 --enable-pcre2-32
 
       - name: Build
-        run: make -j2 CPPFLAGS='-Wall -Wextra -Werror'
+        run: make -j3 CPPFLAGS='-Wall -Wextra -Werror'
 
       - name: Test (main test script)
         run: ./RunTest
@@ -80,27 +80,10 @@ jobs:
         run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' -DCMAKE_C_FLAGS='-Wall -Wextra' -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_BUILD_TYPE=Release -B build
 
       - name: Build
-        run: cmake --build build
-
-      - name: Test (main test script)
-        run: |
-          cd build
-          ../RunTest
-
-      - name: Test (JIT test program)
-        run: |
-          cd build
-          ./pcre2_jit_test
-
-      - name: Test (pcre2grep test script)
-        run: |
-          cd build
-          ../RunGrepTest
+        run: cd build && make -j3
 
-      - name: Test (pcre2posix program)
-        run: |
-          cd build
-          ./pcre2posix_test -v
+      - name: Test
+        run: cd build && ctest -j3 --output-on-failure
 
   windows:
     name: Windows
@@ -121,14 +104,7 @@ jobs:
         run: cmake --build build --config Release
 
       - name: Test
-        id: test
-        run: |
-          cd build
-          ctest -C Release .
-
-      - name: Debug
-        if: ${{ failure() && steps.test.outcome == 'failure' }}
-        run: type build/Testing/Temporary/LastTest.log
+        run: cd build && ctest -C Release -j3 --output-on-failure
 
   coverage:
     name: Code coverage
@@ -146,7 +122,7 @@ jobs:
         run: cmake --build build
 
       - name: Test
-        run: LLVM_PROFILE_FILE="coverage-%m.profraw" cmake --build build --target test
+        run: cd build && LLVM_PROFILE_FILE="coverage-%m.profraw" ctest -j1 --output-on-failure
 
       - name: Report
         run: |
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index c7bc7fec1..c090c6258 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -91,7 +91,7 @@ jobs:
         run: cd build && make -j3
 
       - name: Test
-        run: cd build && make test
+        run: cd build && ctest -j3 --output-on-failure
 
   wasp:
     # Tests with: French locale; oldest supported CMake; no JIT; -Os
@@ -131,11 +131,11 @@ jobs:
         run: ninja -C build
 
       - name: Test
-        run: ninja -C build test
+        run: cd build && ctest -j3 --output-on-failure
 
   bat:
     # Tests with: MSVC 32-bit, and a variety of CMake options
-    name: 32bit MSVC
+    name: Windows (Win32)
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -144,20 +144,17 @@ jobs:
           submodules: true
 
       - name: Configure
-        run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2GREP_SUPPORT_CALLOUT_FORK=OFF -DPCRE2_DEBUG=ON -DPCRE2_NEWLINE=ANYCRLF -DPCRE2_STATIC_PIC=ON -DPCRE2_STATIC_RUNTIME=ON -DPCRE2_SUPPORT_BSR_ANYCRLF=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON -B build -A Win32
+        run: cmake -DPCRE2_SUPPORT_JIT=ON -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2GREP_SUPPORT_CALLOUT_FORK=OFF -DPCRE2_DEBUG=ON -DPCRE2_NEWLINE=ANYCRLF -DPCRE2_STATIC_PIC=ON -DPCRE2_STATIC_RUNTIME=ON -DPCRE2_SUPPORT_BSR_ANYCRLF=ON -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build -A Win32
 
       - name: Build
         run: cmake --build build --config RelWithDebInfo
 
       - name: Test
-        shell: cmd
-        run: |
-          cd build
-          ctest -C RelWithDebInfo .
+        run: cd build && ctest -C RelWithDebInfo -j3 --output-on-failure
 
   pterodactyl:
     # Tests with: MSVC 64-bit, Debug, shared libraries
-    name: 64bit MSVC
+    name: Windows (x64)
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -166,16 +163,13 @@ jobs:
           submodules: true
 
       - name: Configure
-        run: cmake -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_DEBUG=ON -DPCRE2_BUILD_PCRE2GREP=OFF -DPCRE2_BUILD_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build -A x64
+        run: cmake -DPCRE2_BUILD_PCRE2_16=ON -DPCRE2_BUILD_PCRE2_32=ON -DPCRE2_DEBUG=ON -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -DCMAKE_COMPILE_WARNING_AS_ERROR=ON -B build -A x64
 
       - name: Build
         run: cmake --build build --config Debug
 
       - name: Test
-        shell: cmd
-        run: |
-          cd build
-          ctest -C Debug .
+        run: cd build && ctest -C RelWithDebInfo -j3 --output-on-failure
 
   bigbird:
     # Job to execute ManyConfigTests
@@ -222,7 +216,7 @@ jobs:
       - name: Test
         run: |
           cd build
-          ctest .
+          ctest -j3 --output-on-failure
           cd ..
           perl -v
           maint/RunPerlTest