diff --git a/.github/workflows/nix-test.yml b/.github/workflows/nix-test.yml
index 666d971c1..2a47656cd 100644
--- a/.github/workflows/nix-test.yml
+++ b/.github/workflows/nix-test.yml
@@ -18,7 +18,10 @@ jobs:
         run: nix build 'github:${{ github.repository }}?ref=${{ github.ref }}#checks.x86_64-linux.tests' -L --extra-substituters "https://hyprland.cachix.org"
 
       - name: Check exit status
-        run: grep 0 result/exit_status
+        run: |
+          grep 0 result/exit_status || echo "hyprtester failed"
+          grep 0 result/exit_status_gtests || echo "gtests failed"
+          [ 0 = $(cat result/exit_status) ] && [ 0 = $(cat result/exit_status_gtests) ]
 
       - name: Upload artifacts
         if: always()
diff --git a/nix/tests/default.nix b/nix/tests/default.nix
index 7ed0efb50..6c8e54090 100644
--- a/nix/tests/default.nix
+++ b/nix/tests/default.nix
@@ -101,6 +101,7 @@ in
       machine.copy_from_vm("/tmp/testerlog")
       machine.copy_from_vm("/tmp/hyprlog")
       machine.copy_from_vm("/tmp/exit_status")
+      machine.copy_from_vm("/tmp/exit_status_gtests")
 
       # Finally - shutdown
       machine.shutdown()