diff --git a/cmssw-pr-test-config b/cmssw-pr-test-config
index bacdfe3026a4..f09c3c6cbb38 100755
--- a/cmssw-pr-test-config
+++ b/cmssw-pr-test-config
@@ -7,11 +7,15 @@ if [ "${CMSSW_VER}" != "" ] ; then
   CMSSW_MAJOR=$(echo ${CMSSW_VER} | cut -d_ -f2)
   CMSSW_MINOR=$(echo ${CMSSW_VER} | cut -d_ -f3)
 fi
+CMSSW_VER=$(echo x0${CMSSW_MAJOR}x0${CMSSW_MINOR} | sed -r -e 's|x[0]*([0-9][0-9])|\1|g;s|^0||')
 PR_TEST_MATRIX_EXTRAS_LAB_TRACKING=12434.7
+if [ "$CMSSW_VER" -ge 1500 ] ; then
+  PR_TEST_MATRIX_EXTRAS_LAB_TRACKING="${PR_TEST_MATRIX_EXTRAS_LAB_TRACKING=},12834.7"
+fi
 PR_TEST_MATRIX_EXTRAS=1306.0,101.0,9.0,25202.0,10224.0,250202.181
-if [ "$CMSSW_MAJOR" -ge 14 ] ; then
+if [ "$CMSSW_VER" -ge 1400 ] ; then
   PR_TEST_MATRIX_EXTRAS_GPU=12834.402,12834.403,12834.406,12834.412,12834.422,12834.423
-elif [ "$CMSSW_MAJOR" -ge 13 ] ; then
+elif [ "$CMSSW_VER" -ge 1300 ] ; then
   PR_TEST_MATRIX_EXTRAS_GPU=12434.586,12434.587
 else
   PR_TEST_MATRIX_EXTRAS_GPU=11634.586,11634.587