diff --git a/includes/default-variables.yml b/includes/default-variables.yml
index 6a2a5ad680be309c3cecc819f48a0b8e6eaf1e72..d3d328416302e8183db2e30ba0e93eff13447fea 100644
--- a/includes/default-variables.yml
+++ b/includes/default-variables.yml
@@ -17,4 +17,11 @@ variables:
   DISABLE_HRTF: "false"
   PROJECT_ID_FLOAT: "49"
   PROJECT_ID_BASOP: "77"
+  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
+  LONG_TEST_SUITE_RENDERER_SHORT: "tests/codec_be_on_mr_nonselection tests/renderer_short --param_file scripts/config/self_test_ltv.prm --use_ltv"
+  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
+  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
+  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
+  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
+  TEST_SUITE: ""
   INSTR_DIR: "scripts/c-code_instrument"
diff --git a/main-basop.yml b/main-basop.yml
index 2c404abc82dd112a89053a80c7f75e70347c101f..1200deb6c30957244f81296bec76dec782149de0 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -25,12 +25,6 @@ variables:
   EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"
   FLOAT_REF_BRANCH_MERGE_SOURCE: ""
   SCRIPTS_DIR: "/usr/local/scripts"
-  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
-  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
-  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
-  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
-  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
-  TEST_SUITE: ""
   ### These path variables are used by the pytest calls.
   ### They can be overwritten in the job definitions in the variables: section to e.g. only test encoder or decoder in the chain
   ### E.g. a job that tests the BASOP encoder against the float ref via MLD etc. would overwrite DUT_DECODER_PATH with REF_DECODER_PATH in its variables: section
@@ -1973,7 +1967,7 @@ ivas-pytest-compare_ref-long-enc:
     - LEVEL_SCALING=1.0
     - SPLIT_COMPARISON="true"
   <<: *compare-to-ref-anchor
-  
+
 ivas-pytest-compare_ref-long-dec:
   extends:
     - .rules-pytest-long
@@ -1984,11 +1978,11 @@ ivas-pytest-compare_ref-long-dec:
   before_script:
     - USE_LTV=1  
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
-    - TEST_SUITE="$LONG_TEST_SUITE"
+    - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT"
     - LEVEL_SCALING=1.0
     - SPLIT_COMPARISON="true"
   <<: *compare-to-ref-anchor
-  
+
 ivas-pytest-compare_ref-long-enc-lev-10:
   extends:
     - .rules-pytest-long
@@ -2000,7 +1994,7 @@ ivas-pytest-compare_ref-long-enc-lev-10:
     - LEVEL_SCALING=0.3162
     - SPLIT_COMPARISON="true"
   <<: *compare-to-ref-anchor
-  
+
 ivas-pytest-compare_ref-long-dec-lev-10:
   extends:
     - .rules-pytest-long
@@ -2011,7 +2005,7 @@ ivas-pytest-compare_ref-long-dec-lev-10:
   before_script:
     - USE_LTV=1
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
-    - TEST_SUITE="$LONG_TEST_SUITE"
+    - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT"
     - LEVEL_SCALING=0.3162
     - SPLIT_COMPARISON="true"
   <<: *compare-to-ref-anchor
@@ -2027,7 +2021,7 @@ ivas-pytest-compare_ref-long-enc-lev+10:
     - LEVEL_SCALING=3.162
     - SPLIT_COMPARISON="true"
   <<: *compare-to-ref-anchor
-  
+
 ivas-pytest-compare_ref-long-dec-lev+10:
   extends:
     - .rules-pytest-long
@@ -2038,7 +2032,7 @@ ivas-pytest-compare_ref-long-dec-lev+10:
   before_script:
     - USE_LTV=1  
     - DUT_ENCODER_PATH=./$REF_ENCODER_PATH
-    - TEST_SUITE="$LONG_TEST_SUITE"
+    - TEST_SUITE="$LONG_TEST_SUITE_RENDERER_SHORT"
     - LEVEL_SCALING=3.162
     - SPLIT_COMPARISON="true"
   <<: *compare-to-ref-anchor
diff --git a/main-float.yml b/main-float.yml
index 5195bbb0c37ff289d2679d9dc152fc7f9a2d3935..c04482381a369cb3fc7c37ce4c0d8a7143a70d3b 100644
--- a/main-float.yml
+++ b/main-float.yml
@@ -45,12 +45,6 @@ variables:
       - 'complexity'
 
   PYTEST_ARGS: ""
-  LONG_TEST_SUITE: "tests/codec_be_on_mr_nonselection tests/renderer --param_file scripts/config/self_test_ltv.prm --use_ltv"
-  LONG_TEST_SUITE_NO_RENDERER: "tests/codec_be_on_mr_nonselection --param_file scripts/config/self_test_ltv.prm --use_ltv"
-  SHORT_TEST_SUITE: "tests/codec_be_on_mr_nonselection"
-  SHORT_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_basop_encoder.prm"
-  LONG_TEST_SUITE_ENCODER: "tests/codec_be_on_mr_nonselection/test_param_file.py --param_file scripts/config/self_test_ltv_basop_encoder.prm"
-  TEST_SUITE: ""
   COVERAGE_OUTPUT_FILE_STV: "coverage-stv.info"
   COVERAGE_OUTPUT_FILE_LTV: "coverage-ltv.info"
   COVERAGE_OUTPUT_FILE_CONFORMANCE: "coverage-conformance.info"