diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5a2a74dc5..c996440a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Install unzip
         run: apt-get update && apt-get install -y unzip
       - name: Run tests
-        run: cp .env.testing.template .env.testing && make test-plain
+        run: cp .env.testing.template .env.testing && make test
         env:
           COLLECTION_SIGNING_PRIVATE_KEY: ${{ secrets.COLLECTION_SIGNING_PRIVATE_KEY }}
           DATABASE_HOST: postgres
diff --git a/Makefile b/Makefile
index 88217333f..af61190a3 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,9 @@ build:
 run:
 	swift run
 
-test-plain:
-	swift test --disable-automatic-resolution --sanitize=thread --no-parallel
-
 test: xcbeautify
 	set -o pipefail \
-	&& swift test --disable-automatic-resolution --sanitize=thread \
+	&& swift test --disable-automatic-resolution --sanitize=thread --no-parallel \
 	2>&1 | ./xcbeautify --renderer github-actions
 
 test-query-performance: xcbeautify
@@ -58,7 +55,7 @@ test-fast:
 xcbeautify:
 	rm -rf .build/checkouts/xcbeautify
 	git clone https://github.com/cpisciotta/xcbeautify.git .build/checkouts/xcbeautify
-	cd .build/checkouts/xcbeautify && git checkout 2.6.0 && make build
+	cd .build/checkouts/xcbeautify && git checkout 2.25.1 && make build
 	binpath=`cd .build/checkouts/xcbeautify && swift build -c release --show-bin-path` && ln -sf $$binpath/xcbeautify
 
 docker-build: version