diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-9-branch.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-9-branch.Jenkinsfile
deleted file mode 100644
index 69dea59..0000000
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-9-branch.Jenkinsfile
+++ /dev/null
@@ -1,72 +0,0 @@
-pipeline {
-  agent {
-    kubernetes {
-      yamlFile 'jenkins/pod-templates/cdt-full-pod-standard.yaml'
-    }
-  }
-  options {
-    timestamps()
-    disableConcurrentBuilds()
-  }
-  stages {
-    stage('Git Clone CDT') {
-      steps {
-        container('cdt') {
-          // We use "checkout" instead of "git" here so we can specify relativeTargetDir and other options
-          checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', honorRefspec: true, noTags: true, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'eclipse-cdt']], submoduleCfg: [], userRemoteConfigs: [[refspec: '+refs/heads/master:refs/remotes/origin/master', url: 'https://git.eclipse.org/r/cdt/org.eclipse.cdt.git']]])
-        }
-      }
-    }
-    stage('Git Clone GDB') {
-      steps {
-        container('cdt') {
-          // We use "checkout" instead of "git" here so we can specify relativeTargetDir and other options
-          checkout([$class: 'GitSCM', branches: [[name: '*/gdb-9-branch']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', honorRefspec: true, noTags: true, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'binutils-gdb']], submoduleCfg: [], userRemoteConfigs: [[refspec: '+refs/heads/gdb-9-branch:refs/remotes/origin/gdb-9-branch', url: 'https://github.com/bminor/binutils-gdb.git']]])
-        }
-      }
-    }
-    stage('Build GDB') {
-      steps {
-        container('cdt') {
-          timeout(activity: true, time: 20) {
-            sh """
-                mkdir gdb-build
-                cd gdb-build
-                ../binutils-gdb/configure
-                make -j1 V=1
-                cp gdb/gdb gdb/gdb.9.0
-               """
-          }
-        }
-      }
-    }
-    stage('Run build') {
-      steps {
-        container('cdt') {
-          timeout(activity: true, time: 20) {
-            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
-                sh "cd ${WORKSPACE}/eclipse-cdt && /usr/share/maven/bin/mvn \
-                      clean verify -B -V \
-                      -Pskip-tests-except-dsf-gdb \
-                      -Dcdt.tests.dsf.gdb.versions=gdb.9.0 \
-                      -Ddsf.gdb.tests.gdbPath=${WORKSPACE}/gdb-build/gdb \
-                      -DskipDoc=true \
-                      -Ddsf.gdb.tests.timeout.multiplier=50 \
-                      -Dindexer.timeout=300 \
-                      -Dmaven.repo.local=/home/jenkins/.m2/repository \
-                      --settings /home/jenkins/.m2/settings.xml \
-                      "
-            }
-          }
-        }
-      }
-    }
-  }
-  post {
-    always {
-      container('cdt') {
-        junit 'eclipse-cdt/*/*/target/surefire-reports/*.xml'
-      }
-    }
-  }
-}
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-8.3-branch.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile
similarity index 73%
rename from jenkins/pipelines/cdt/debug/debug-tests-master-gdb-8.3-branch.Jenkinsfile
rename to jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile
index d91bc35..24d832b 100644
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-8.3-branch.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-latest-branch.Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
       steps {
         container('cdt') {
           // We use "checkout" instead of "git" here so we can specify relativeTargetDir and other options
-          checkout([$class: 'GitSCM', branches: [[name: '*/gdb-8.3-branch']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', honorRefspec: true, noTags: true, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'binutils-gdb']], submoduleCfg: [], userRemoteConfigs: [[refspec: '+refs/heads/gdb-8.3-branch:refs/remotes/origin/gdb-8.3-branch', url: 'https://github.com/bminor/binutils-gdb.git']]])
+          checkout([$class: 'GitSCM', branches: [[name: '*/gdb-10-branch']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', honorRefspec: true, noTags: true, reference: '', shallow: true], [$class: 'RelativeTargetDirectory', relativeTargetDir: 'binutils-gdb']], submoduleCfg: [], userRemoteConfigs: [[refspec: '+refs/heads/gdb-10-branch:refs/remotes/origin/gdb-10-branch', url: 'https://github.com/bminor/binutils-gdb.git']]])
         }
       }
     }
@@ -32,9 +32,10 @@ pipeline {
             sh """
                 mkdir gdb-build
                 cd gdb-build
-                ../binutils-gdb/configure
+                ${WORKSPACE}/binutils-gdb/configure --prefix=${WORKSPACE}/gdb-install
                 make -j1 V=1
-                cp gdb/gdb gdb/gdb.8.3
+                make -C gdb install MAKEINFO=true
+                make -C gdbserver install MAKEINFO=true
                """
           }
         }
@@ -48,8 +49,8 @@ pipeline {
                 sh "cd ${WORKSPACE}/eclipse-cdt && /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
-                      -Dcdt.tests.dsf.gdb.versions=gdb.8.3 \
-                      -Ddsf.gdb.tests.gdbPath=${WORKSPACE}/gdb-build/gdb \
+                      -Dcdt.tests.dsf.gdb.versions=gdb,gdbserver \
+                      -Ddsf.gdb.tests.gdbPath=${WORKSPACE}/gdb-install \
                       -DskipDoc=true \
                       -Ddsf.gdb.tests.timeout.multiplier=50 \
                       -Dindexer.timeout=300 \
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile
index 93c408c..f53ef40 100644
--- a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-master.Jenkinsfile
@@ -32,9 +32,10 @@ pipeline {
             sh """
                 mkdir gdb-build
                 cd gdb-build
-                ../binutils-gdb/configure
+                ${WORKSPACE}/binutils-gdb/configure --prefix=${WORKSPACE}/gdb-install
                 make -j1 V=1
-                cp gdb/gdb gdb/gdb.10.0
+                make -C gdb install MAKEINFO=true
+                make -C gdbserver install MAKEINFO=true
                """
           }
         }
@@ -48,8 +49,8 @@ pipeline {
                 sh "cd ${WORKSPACE}/eclipse-cdt && /usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
-                      -Dcdt.tests.dsf.gdb.versions=gdb.10.0 \
-                      -Ddsf.gdb.tests.gdbPath=${WORKSPACE}/gdb-build/gdb \
+                      -Dcdt.tests.dsf.gdb.versions=gdb,gdbserver \
+                      -Ddsf.gdb.tests.gdbPath=${WORKSPACE}/gdb-install \
                       -DskipDoc=true \
                       -Ddsf.gdb.tests.timeout.multiplier=50 \
                       -Dindexer.timeout=300 \
diff --git a/jenkins/pipelines/cdt/debug/debug-remote-tests-master-gdb-8.3.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile
similarity index 94%
rename from jenkins/pipelines/cdt/debug/debug-remote-tests-master-gdb-8.3.Jenkinsfile
rename to jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile
index 1e5c7f7..385a70d 100644
--- a/jenkins/pipelines/cdt/debug/debug-remote-tests-master-gdb-8.3.Jenkinsfile
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-supported.Jenkinsfile
@@ -24,7 +24,7 @@ pipeline {
                 sh "/usr/share/maven/bin/mvn \
                       clean verify -B -V \
                       -Pskip-tests-except-dsf-gdb \
-                      -Dcdt.tests.dsf.gdb.versions=gdbserver.8.3 \
+                      -Dcdt.tests.dsf.gdb.versions=supported \
                       -DskipDoc=true \
                       -Ddsf.gdb.tests.timeout.multiplier=50 \
                       -Dindexer.timeout=300 \
diff --git a/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile
new file mode 100644
index 0000000..314e698
--- /dev/null
+++ b/jenkins/pipelines/cdt/debug/debug-tests-master-gdb-unsupported.Jenkinsfile
@@ -0,0 +1,47 @@
+pipeline {
+  agent {
+    kubernetes {
+      yamlFile 'jenkins/pod-templates/cdt-full-pod-standard.yaml'
+    }
+  }
+  options {
+    timestamps()
+    disableConcurrentBuilds()
+  }
+  stages {
+    stage('Git Clone') {
+      steps {
+        container('cdt') {
+          git branch: 'master', url: 'https://git.eclipse.org/r/cdt/org.eclipse.cdt.git'
+        }
+      }
+    }
+    stage('Run build') {
+      steps {
+        container('cdt') {
+          timeout(activity: true, time: 20) {
+            withEnv(['MAVEN_OPTS=-Xmx768m -Xms768m']) {
+                sh "/usr/share/maven/bin/mvn \
+                      clean verify -B -V \
+                      -Pskip-tests-except-dsf-gdb \
+                      -Dcdt.tests.dsf.gdb.versions=unsupported \
+                      -DskipDoc=true \
+                      -Ddsf.gdb.tests.timeout.multiplier=50 \
+                      -Dindexer.timeout=300 \
+                      -Dmaven.repo.local=/home/jenkins/.m2/repository \
+                      --settings /home/jenkins/.m2/settings.xml \
+                      "
+            }
+          }
+        }
+      }
+    }
+  }
+  post {
+    always {
+      container('cdt') {
+        junit '*/*/target/surefire-reports/*.xml'
+      }
+    }
+  }
+}