diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests
index 4cf4b82c..1e528f5c 100644
--- a/ci/Jenkinsfile.tests
+++ b/ci/Jenkinsfile.tests
@@ -40,7 +40,11 @@ pipeline {
 
     stage('Test') {
       steps { script { dir(env.REPO) {
-        nix.develop('make test-ci', pure: false)
+        if (env.JOB_BASE_NAME == "race") {
+          nix.develop('make test-with-race', pure: false)
+        }else {
+          nix.develop('make test-ci', pure: false)
+        }
       } } }
     }
 
@@ -60,7 +64,11 @@ pipeline {
         GANACHE_NETWORK_RPC_URL = "ws://localhost:${env.GANACHE_RPC_PORT}"
       }
       steps { script { dir(env.REPO) {
-        nix.develop('make test-onchain', pure: false)
+        if (env.JOB_BASE_NAME == "race") {
+          nix.develop('make test-onchain-with-race', pure: false)
+        }else {
+          nix.develop('make test-onchain', pure: false)
+        }
       } } }
     }
   }
diff --git a/ci/Jenkinsfile.testsWithRace b/ci/Jenkinsfile.testsWithRace
deleted file mode 100644
index d16e4603..00000000
--- a/ci/Jenkinsfile.testsWithRace
+++ /dev/null
@@ -1,76 +0,0 @@
-library 'status-jenkins-lib@v1.7.0'
-
-pipeline {
-  agent {
-    label 'linux && nix-2.11 && x86_64'
-  }
-
-  options {
-    timestamps()
-    disableConcurrentBuilds()
-    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 30, unit: 'MINUTES')
-    /* Go requires a certain directory structure */
-    checkoutToSubdirectory('src/github.com/waku-org/go-waku')
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '30',
-    ))
-  }
-
-  environment {
-    TARGET  = 'tests-with-race'
-    REPO    = "${env.WORKSPACE}/src/github.com/waku-org/go-waku"
-    GOCACHE = "${env.WORKSPACE_TMP}/go-build"
-    GOPATH  = "${env.WORKSPACE}/go"
-    PATH    = "${env.PATH}:${env.GOPATH}/bin"
-    /* Necesary to avoid cache poisoning by other builds. */
-    GOLANGCI_LINT_CACHE = "${env.WORKSPACE_TMP}/golangci-lint"
-    /* Ganache config */
-    GANACHE_RPC_PORT = "${8989 + env.EXECUTOR_NUMBER.toInteger()}"
-  }
-
-  stages {
-    stage('Tests with race flag') {
-      steps { script { dir(env.REPO) {
-        nix.develop('make test-with-race', pure: false)
-      } } }
-    }
-
-    stage('Ganache') {
-      environment {
-        GANACHE_MNEMONIC = 'swim relax risk shy chimney please usual search industry board music segment'
-      }
-      steps { script {
-        ganache = docker.image(
-          'trufflesuite/ganache:v7.4.1'
-        ).run(
-          "-p 127.0.0.1:${env.GANACHE_RPC_PORT}:8545",
-          "-m='${GANACHE_MNEMONIC}'"
-        )
-      } }
-    }
-
-    stage('On-chain tests with race flag') {
-      environment {
-        GANACHE_NETWORK_RPC_URL = "ws://localhost:${env.GANACHE_RPC_PORT}"
-      }
-      steps { script { dir(env.REPO) {
-        nix.develop('make test-onchain-with-race', pure: false)
-      } } }
-    }
-  }
-  post {
-    always  { script { /* No artifact but a PKG_URL is necessary. */
-      env.PKG_URL = "${currentBuild.absoluteUrl}consoleText"
-    } }
-    success { script { github.notifyPR(true) } }
-    failure { script { github.notifyPR(false) } }
-    cleanup { script {
-      cleanWs()
-      catchError {
-        ganache.stop()
-      }
-    } }
-  }
-}