diff --git a/example.gitlab-ci.yml b/example.gitlab-ci.yml
index d55d29fdba6bc89aebdfebada9b92a7ba6fd6b38..d1c92e52a26ba5510287528765382b2ebd710c44 100644
--- a/example.gitlab-ci.yml
+++ b/example.gitlab-ci.yml
@@ -1,12 +1,28 @@
 variables:
    AUTH_USER: hpc_username
+   SLURM_NODELIST: "phinally"
+   SLURM_CONSTRAINT: "hwperf"
+   SLURM_TIMELIMIT: "30"
 
 stages:
    - build
+   - pretest
    - test
 
 gcc_9_mpionly:
    stage: build
+   variables:
+      CTEST_EXCLUDE_LABELS: "longrun"
+      OMP_NUM_THREADS: "4"
+      OMP_WAIT_POLICY: "PASSIVE"
+      CMAKE_BUILD_TYPE: "Release"
+      WALBERLA_BUFFER_DEBUG: "OFF"
+      WALBERLA_DOUBLE_ACCURACY: "ON"
+      WALBERLA_ENABLE_GUI: "OFF"
+      WALBERLA_BUILD_WITH_MPI: "ON"
+      WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_METIS: "OFF"
+      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
    script:
       - module load cmake/3.11.1
       - module load openmpi/3.1.5-gcc
@@ -47,40 +63,33 @@ gcc_9_mpionly:
       - cmake . -LA
       - cd tests/core
       - make -j $NUM_BUILD_CORES -l $NUM_CORES ReduceTest
-   variables:
-      CTEST_EXCLUDE_LABELS: "longrun"
-      OMP_NUM_THREADS: "4"
-      OMP_WAIT_POLICY: "PASSIVE"
-      CMAKE_BUILD_TYPE: "Release"
-      WALBERLA_BUFFER_DEBUG: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-      WALBERLA_ENABLE_GUI: "OFF"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
    tags:
       - testcluster
    artifacts:
       paths:
          - build
 
+pretest:
+   stage: pretest
+   variables:
+      NO_SLURM_SUBMIT: 1
+   script:
+      - echo "Demoing, running on frontend"
+      - hostname
+   tags:
+      - testcluster
+
 test:
    stage: test
    variables:
-      SUBMIT_TO_SLURM: 1
-      SLURM_PARTITION: "work"
-      SLURM_TIMELIMIT: 20
-      SLURM_CONSTRAINT: hwperf
-      SLURM_NODELIST: broadep2
-      SLURM_NODES: 1
+      SLURM_TIMELIMIT: "20"
+      SLURM_NODELIST: "broadep2"
       CTEST_EXCLUDE_LABELS: "longrun"
       CMAKE_BUILD_TYPE: "Release"
    script:
       - module load cmake/3.11.1
       - module load openmpi/3.1.5-gcc
       - module load gcc/9.1.0
-      - module load slurm
       - export NUM_CORES=$(nproc --all)
       - cd $CI_PROJECT_DIR/build/tests/core
       - ctest -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES -T Test -R ReduceTest