diff --git a/run-ib-testbase.sh b/run-ib-testbase.sh
index 09318294b102..663e18afe8fa 100755
--- a/run-ib-testbase.sh
+++ b/run-ib-testbase.sh
@@ -10,7 +10,8 @@ voms-proxy-init -voms cms || true
 export PYTHONUNBUFFERED=1
 export ARCHITECTURE=${ARCHITECTURE}
 export RELEASE_FORMAT=${RELEASE_FORMAT}
-source /cvmfs/cms-ib.cern.ch/week1/cmsset_default.sh  || true
+LAST_WEEK=$(ls -d /cvmfs/cms-ib.cern.ch/nweek-* | head -1)
+source ${LAST_WEEK}/cmsset_default.sh  || true
 scram -a ${ARCHITECTURE} project ${RELEASE_FORMAT}
 cp $WORKSPACE/cms-bot/das-utils/das_client $WORKSPACE/cms-bot/das-utils/das_client.py
 cd ${RELEASE_FORMAT}
@@ -18,7 +19,7 @@ set +x
 eval \$(scram runtime -sh)
 set -x
 $WORKSPACE/cms-bot/das-utils/use-ibeos-sort
-export CMS_PATH=/cvmfs/cms-ib.cern.ch/week1
+export CMS_PATH=${LAST_WEEK}
 export PATH=$WORKSPACE/cms-bot/das-utils:\$PATH
 which das_client
 grep 'ibeos-lfn-sort' \${LOCALRT}/src/Configuration/PyReleaseValidation/python/*.py || true