diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index e108e36..7826911 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -7,10 +7,14 @@
   exit 1
 fi
 
-if [ "$sysmobts" = "no" -a "$sysmodsp" = "yes" ]; then
-  echo "This config does not make sense."
-  exit 0
+# Compat: to be able to smoothly reconfigure the jenkins job, handle both
+# old and new matrix variables
+if [ -z "$with_dsp" -a "$sysmodsp" = yes ]; then
+  with_dsp="sysmo"
+else
+  with_vty="yes"
 fi
+# end of compat part
 
 base="$PWD"
 deps="$base/deps"
@@ -19,6 +23,40 @@
 rm -rf "$inst"
 mkdir -p "$deps"
 
+# Collect configure options for osmo-pcu
+PCU_CONFIG=""
+if [ "$with_dsp" = sysmo ]; then
+  PCU_CONFIG="$PCU_CONFIG --enable-sysmocom-dsp"
+
+  # For direct sysmo DSP access, provide the SysmoBTS Layer 1 API
+  cd "$deps"
+  if [ ! -d layer1-api ]; then
+    git clone git://git.sysmocom.de/sysmo-bts/layer1-api.git layer1-api
+  fi
+  cd layer1-api
+  git fetch origin
+  git reset --hard origin/master
+  api_incl="$inst/include/sysmocom/femtobts/"
+  mkdir -p "$api_incl"
+  cp include/*.h "$api_incl"
+
+elif [ -z "$with_dsp" -o "$with_dsp" = none ]; then
+  echo "Direct DSP access disabled"
+else
+  echo 'Invalid $with_dsp value:' $with_dsp
+  exit 1
+fi
+
+if [ "$with_vty" = "yes" ]; then
+  PCU_CONFIG="$PCU_CONFIG --enable-vty-tests"
+elif [ -z "$with_vty" -o "$with_vty" = "no" ]; then
+  echo "VTY tests disabled"
+else
+  echo 'Invalid $with_vty value:' $with_vty
+  exit 1
+fi
+
+# Build deps
 cd "$deps"
 osmo-deps.sh libosmocore
 cd libosmocore
@@ -26,24 +64,10 @@
 ./configure --prefix="$inst"
 $MAKE $PARALLEL_MAKE install
 
-cd "$deps"
-if [ ! -d layer1-api ]; then
-  git clone git://git.sysmocom.de/sysmo-bts/layer1-api.git layer1-api
-fi
-cd layer1-api
-git fetch origin
-git reset --hard origin/master
-api_incl="$inst/include/sysmocom/femtobts/"
-mkdir -p "$api_incl"
-cp include/*.h "$api_incl"
-
-PCU_CONFIG="--enable-sysmocom-bts=$sysmobts --enable-sysmocom-dsp=$sysmodsp"
-if [ "$sysmobts" = "no" ]; then
-  PCU_CONFIG="$PCU_CONFIG --enable-vty-tests"
-fi
-
 export PKG_CONFIG_PATH="$inst/lib/pkgconfig"
 export LD_LIBRARY_PATH="$inst/lib"
+
+# Build osmo-pcu
 cd "$base"
 autoreconf --install --force
 ./configure $PCU_CONFIG