diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c331573a9725750eb56c0cb54b8a6eb4381522a3..8084f41fd904beca1753e89a033792c1292622ca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,14 @@ cmake:
     stage: build
     tags:
         - cvmfs
+    variables:
+        TERM: xterm
     script:
-        - source /cvmfs/cms.cern.ch/cmsset_default.sh
         - yum install -y cmake3 openssl-devel python3 zsh
+        - source ./setup
         - ./install.sh
         - cd CMSSW*/
         - shopt -s expand_aliases  # allows aliases like cmsenv to be used
         - cmsenv
+        - python -c "import CRABAPI"
         - scram b -j$(nproc)
diff --git a/README.md b/README.md
index b8186b27aa011e63c9ff78290ef5a8481604a3f8..58059585de3a6a421ec35085d9771c76f1e5a781 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ The `Campaigns` subgroup contains actual repos corresponding to different analys
 
 In general, it is recommended that you install the software on a fast disk to ensure fast compilation (e.g. AFS), but that you process the heavy n-tuples on a dedicated area (e.g. NFS at DESY, EOS at CERN). Keeping the software neat and clean is important for reproducibility.
 
-1. Clone the `Installer`. Then source the minimal environment for CMSSW, CRAB, and RUCIO:
+1. Clone the `Installer` in a directory (we propose `DasAnalysisSystem`). Then source the minimal environment for CMSSW, CRAB, and RUCIO from that directory:
 ```
 cd DasAnalysisSystem
 source ./setup
diff --git a/setup b/setup
index 65ecd139826ea1ccdaf1a06046e7fbd192c1ef1f..4492ff827be7a0f80b1c69cf4bd0ab18b7bd4cb9 100644
--- a/setup
+++ b/setup
@@ -6,7 +6,6 @@ case "$(hostname)" in
         module use -a /afs/desy.de/group/cms/modulefiles/
         module load cmssw
         source /cvmfs/grid.desy.de/etc/profile.d/grid-ui-env.sh
-        source /cvmfs/cms.cern.ch/crab3/crab.sh
         ;;
     *cern.ch)
         tput setaf 2
@@ -17,7 +16,6 @@ case "$(hostname)" in
         tput setaf 2
         echo "Environment set up for IIHE T2B cluster."
         tput op
-        source /cvmfs/cms.cern.ch/cmsset_default.sh
         ;;
     *)
         tput setaf 3
@@ -28,6 +26,7 @@ esac
 
 source /cvmfs/cms.cern.ch/cmsset_default.sh
 source /cvmfs/cms.cern.ch/rucio/setup-py3.sh
+source /cvmfs/cms.cern.ch/crab3/crab.sh
 
 if [ -n "$RUCIO_ACCOUNT" ]
 then