diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 8e24cf3f4e9dec0c51d6ba100bb4485fa4cfbdc0..bc23781d6fc8d0aedb1313982feff09ac42ecc42 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -79,7 +79,7 @@ pipeline {
 
 					stage ("Checkout") {
 						sh "sudo chown -R jenkins:users ."  
-						env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")
+						env.GERRIT_PROJECT_URL = env.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)
 					
 						/*
 						 * Jenkins has already automatically checked out the base branch
@@ -102,10 +102,10 @@ pipeline {
 							checkout scm: [$class: 'GitSCM',
 								branches: [[name: env.GERRIT_BRANCH ]],
 								extensions: [
-									[$class: 'ScmName', name: 'gerrit-public'],
+									[$class: 'ScmName', name: env.GERRIT_NAME],
 									[$class: 'CleanBeforeCheckout'],
 									[$class: 'PreBuildMerge', options: [
-										mergeRemote: 'gerrit-public',
+										mergeRemote: env.GERRIT_NAME,
 										fastForwardMode: 'NO_FF',
 										mergeStrategy: 'RECURSIVE',
 										mergeTarget: env.GERRIT_BRANCH]],
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 504313996a93fb5f9360569e7efe5aada51ebe84..3961cf538b2bf4e4a30d48cbf337f89b3b093c0c 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
 
 					stage ("Checkout") {
 						sh "sudo chown -R jenkins:users ."
-						env.GERRIT_PROJECT_URL = env.GERRIT_CHANGE_URL.replaceAll(/\/[0-9]+$/, "/${env.GERRIT_PROJECT}")
+						env.GERRIT_PROJECT_URL = env.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)
 
 						/*
 						 * Jenkins has already automatically checked out the base branch
@@ -103,10 +103,10 @@ pipeline {
 							checkout scm: [$class: 'GitSCM',
 								branches: [[name: env.GERRIT_BRANCH ]],
 								extensions: [
-									[$class: 'ScmName', name: 'gerrit-public'],
+									[$class: 'ScmName', name: env.GERRIT_NAME],
 									[$class: 'CleanBeforeCheckout'],
 									[$class: 'PreBuildMerge', options: [
-										mergeRemote: 'gerrit-public',
+										mergeRemote: env.GERRIT_NAME,
 										fastForwardMode: 'NO_FF',
 										mergeStrategy: 'RECURSIVE',
 										mergeTarget: env.GERRIT_BRANCH]],