diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 36e94aec6c21801d1b786a2f0d1b3b66c2bed856..d665caa252ffe09af69dc19af273db76a2df9859 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ variables:
   SCRIPTS_DIR: "/usr/local/scripts"
   EXIT_CODE_NON_BE: 123
   EXIT_CODE_FAIL: 1
-  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/test_param_file_ltv.py tests/renderer"
+  LONG_TEST_SUITE: "tests/test_param_file_ltv.py tests/renderer"
   SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
   USE_REF_ENC: "1"
   TEST_SUITE: ""
@@ -100,7 +100,7 @@ stages:
   # create short test vectors
   - python3 tests/create_short_testvectors.py
   # create references
-  - python3 -m pytest $TEST_SUITE -v --update_ref 1 -m create_ref -n auto
+  - python3 -m pytest $TEST_SUITE -v --update_ref 1 -m create_ref --create_ref -n auto
   - python3 -m pytest $TEST_SUITE -v --update_ref 1 -m create_ref_part2 -n auto
 
 
@@ -197,9 +197,9 @@ stages:
     # timeout of 15 min per individual testcase - hopefully too much, but better be safe for now
     - testcase_timeout=900
     - if [ $USE_REF_ENC -eq 1 ]; then
-    -    python3 -m pytest $TEST_SUITE -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path ./IVAS_cod_ref -n auto --testcase_timeout $testcase_timeout || exit_code=$?
+    -    python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld --dut_encoder_path ./IVAS_cod_ref -n auto --testcase_timeout $testcase_timeout || exit_code=$?
     - else
-    -    python3 -m pytest $TEST_SUITE -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld -n auto --testcase_timeout $testcase_timeout || exit_code=$?
+    -    python3 -m pytest $TEST_SUITE -v --create_cut --html=report.html --self-contained-html --junit-xml=report-junit.xml --mld -n auto --testcase_timeout $testcase_timeout || exit_code=$?
     - fi
     - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true