diff --git a/build/ci/jenkins-presubmit.groovy b/build/ci/jenkins-presubmit.groovy
index 59d7c60..552e75e 100644
--- a/build/ci/jenkins-presubmit.groovy
+++ b/build/ci/jenkins-presubmit.groovy
@@ -5,12 +5,53 @@
 pipeline {
     agent none
     options {
-        disableConcurrentBuilds()
+        disableConcurrentBuilds(abortPrevious: true)
+        parallelsAlwaysFailFast()
     }
     stages {
+        stage('Gazelle') {
+            agent {
+                node {
+                    label ""
+                    customWorkspace '/home/ci/monogon'
+                }
+            }
+            steps {
+                gerritCheck checks: ['jenkins:gazelle': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
+                echo "Gerrit change: ${GERRIT_CHANGE_URL}"
+                sh "git clean -fdx -e '/bazel-*'"
+                sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci mod tidy --lockfile_mode=update"
+                sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci run //:tidy"
+            }
+            post {
+                always {
+                    script {
+                        def diff = sh script: "git status --porcelain", returnStdout: true
+                        if (diff.trim() != "") {
+                                    sh "git diff HEAD"
+                            error """
+                                Unclean working directory after running gazelle.
+                                Please run:
+
+                                \$ bazel mod tidy --lockfile_mode=update
+                                \$ bazel run //:tidy
+
+                                In your git checkout and amend the resulting diff to this changelist.
+                            """
+                        }
+                    }
+                }
+                success {
+                    gerritCheck checks: ['jenkins:gazelle': 'SUCCESSFUL']
+                }
+                unsuccessful {
+                    gerritCheck checks: ['jenkins:gazelle': 'FAILED']
+                }
+            }
+        }
         stage('Parallel') {
             parallel {
-                stage('Test') {
+                stage('Test - Default') {
                     agent {
                         node {
                             label ""
@@ -18,73 +59,76 @@
                         }
                     }
                     steps {
-                        gerritCheck checks: ['jenkins:test': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
+                        gerritCheck checks: ['jenkins:test_default': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
                         echo "Gerrit change: ${GERRIT_CHANGE_URL}"
                         sh "git clean -fdx -e '/bazel-*'"
+
                         sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci test //..."
+                    }
+                    post {
+                        success {
+                            gerritCheck checks: ['jenkins:test_default': 'SUCCESSFUL']
+                        }
+                        unsuccessful {
+                            gerritCheck checks: ['jenkins:test_default': 'FAILED']
+                        }
+                    }
+                }
+                stage('Test - Debug') {
+                    agent {
+                        node {
+                            label ""
+                            customWorkspace '/home/ci/monogon'
+                        }
+                    }
+                    steps {
+                        gerritCheck checks: ['jenkins:test_debug': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
+                        echo "Gerrit change: ${GERRIT_CHANGE_URL}"
+                        sh "git clean -fdx -e '/bazel-*'"
+
                         sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci test --config dbg //..."
+                    }
+                    post {
+                        success {
+                            gerritCheck checks: ['jenkins:test_debug': 'SUCCESSFUL']
+                        }
+                        unsuccessful {
+                            gerritCheck checks: ['jenkins:test_debug': 'FAILED']
+                        }
+                    }
+                }
+                stage('Test - Race') {
+                    agent {
+                        node {
+                            label ""
+                            customWorkspace '/home/ci/monogon'
+                        }
+                    }
+                    steps {
+                        gerritCheck checks: ['jenkins:test_race': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
+                        echo "Gerrit change: ${GERRIT_CHANGE_URL}"
+                        sh "git clean -fdx -e '/bazel-*'"
+
                         sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci test --config race //..."
                     }
                     post {
                         success {
-                            gerritCheck checks: ['jenkins:test': 'SUCCESSFUL']
+                            gerritCheck checks: ['jenkins:test_race': 'SUCCESSFUL']
                         }
                         unsuccessful {
-                            gerritCheck checks: ['jenkins:test': 'FAILED']
+                            gerritCheck checks: ['jenkins:test_race': 'FAILED']
                         }
                     }
                 }
-
-                stage('Gazelle') {
-                    agent {
-                        node {
-                            label ""
-                            customWorkspace '/home/ci/monogon'
-                        }
-                    }
-                    steps {
-                        gerritCheck checks: ['jenkins:gazelle': 'RUNNING'], message: "Running on ${env.NODE_NAME}"
-                        echo "Gerrit change: ${GERRIT_CHANGE_URL}"
-                        sh "git clean -fdx -e '/bazel-*'"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci mod tidy --lockfile_mode=update"
-                        sh "JENKINS_NODE_COOKIE=dontKillMe tools/bazel --bazelrc=.bazelrc.ci run //:tidy"
-                    }
-                    post {
-                        always {
-                            script {
-                                def diff = sh script: "git status --porcelain", returnStdout: true
-                                if (diff.trim() != "") {
-                                    sh "git diff HEAD"
-                                    error """
-                                        Unclean working directory after running gazelle.
-                                        Please run:
-
-                                        \$ bazel mod tidy --lockfile_mode=update
-                                        \$ bazel run //:tidy
-
-                                        In your git checkout and amend the resulting diff to this changelist.
-                                    """
-                                }
-                            }
-                        }
-                        success {
-                            gerritCheck checks: ['jenkins:gazelle': 'SUCCESSFUL']
-                        }
-                        unsuccessful {
-                            gerritCheck checks: ['jenkins:gazelle': 'FAILED']
-                        }
-                    }
-                }
-            }
-
-            post {
-                success {
-                    gerritReview labels: [Verified: 1]
-                }
-                unsuccessful {
-                    gerritReview labels: [Verified: -1]
-                }
             }
         }
     }
-}
+    post {
+        success {
+            gerritReview labels: [Verified: 1]
+        }
+        unsuccessful {
+            gerritReview labels: [Verified: -1]
+        }
+    }
+}
\ No newline at end of file