diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 6b1e3d54cf8..133c34fe2e3 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -131,7 +131,6 @@ python-test:
       - results/vkd3d-proton.log
   variables:
     HWCI_TEST_SCRIPT: ./install/vkd3d-proton/run.sh
-    B2C_JOB_SUCCESS_REGEX: 'vkd3d-proton execution: SUCCESS\r$'
 
 .piglit-traces-test:
   artifacts:
@@ -287,7 +286,7 @@ python-test:
     # boot2container initrd configuration parameters.
     B2C_KERNEL_URL: 'https://gitlab.freedesktop.org/gfx-ci/ci-tron/-/package_files/519/download'  # Linux 6.1
     B2C_INITRAMFS_URL: 'https://gitlab.freedesktop.org/mupuf/boot2container/-/releases/v0.9.10/downloads/initramfs.linux_amd64.cpio.xz'
-    B2C_JOB_SUCCESS_REGEX: '\[.*\]: Execution is over, pipeline status: 0\r$'
+    B2C_JOB_SUCCESS_REGEX: 'hwci: mesa: pass\r$'
     B2C_LOG_LEVEL: 6
     B2C_POWEROFF_DELAY: 15
     B2C_SESSION_END_REGEX: '^.*It''s now safe to turn off your computer\r$'
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 8399d702314..29d0d905af6 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -260,7 +260,6 @@
 
 .b2c-deqp-test:
   variables:
-    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
 
 .tahiti-test-valve:
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
index 4d0bcbbab83..049c91e235b 100644
--- a/src/freedreno/ci/gitlab-ci.yml
+++ b/src/freedreno/ci/gitlab-ci.yml
@@ -348,4 +348,3 @@ a750_vk:
     B2C_TIMEOUT_OVERALL_MINUTES: 55
     DEQP_SUITE: freedreno-a750-vk
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
-    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml
index da72fa1a2ee..3c3e94fe198 100644
--- a/src/gallium/drivers/r300/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml
@@ -44,7 +44,6 @@ r300-rv530-nine:
   variables:
     GTEST: "/NineTests/NineTests"
     HWCI_TEST_SCRIPT: "/install/gtest-runner.sh"
-    B2C_JOB_SUCCESS_REGEX: '^\+ GTEST_EXITCODE=0\r$'
     HWCI_START_WESTON: 1
     GPU_VERSION: r300-rv530-nohiz
     FDO_CI_CONCURRENT: 1
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index e13169229f5..362e838b40a 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -193,7 +193,6 @@
   variables:
     VK_DRIVER: freedreno
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
-    B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
     # Disable reporting, since DUTs don't have internet access
     FLAKES_CHANNEL: ""
 
@@ -207,7 +206,6 @@
     DEQP_SUITE: zink-radv
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
     B2C_KERNEL_URL: https://fs.mupuf.org/linux-6.6-b2c-radv-ci # 6.6
-    B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
     B2C_TIMEOUT_OVERALL_MINUTES: 20
 
     # Disable reporting, since DUTs don't have internet access
diff --git a/src/nouveau/ci/gitlab-ci-inc.yml b/src/nouveau/ci/gitlab-ci-inc.yml
index 242a4b618d6..64fe7c62e2d 100644
--- a/src/nouveau/ci/gitlab-ci-inc.yml
+++ b/src/nouveau/ci/gitlab-ci-inc.yml
@@ -47,7 +47,6 @@
     GPU_VERSION: nvk-ga106
     FDO_CI_CONCURRENT: 16
     RUNNER_FARM_LOCATION: mupuf
-    B2C_JOB_SUCCESS_REGEX: '^\+ DEQP_EXITCODE=0\r$'
     B2C_JOB_WARN_REGEX: 'nouveau .+ job timeout|NMI backtrace for cpu \d+'
     # Default kernel is missing the GA106 GSP
     # 1 - clone b2c