diff --git a/main-basop.yml b/main-basop.yml
index 426cca18bbe87b5f7cb701ac191d5108a33a2788..a5fa884a35fae7f772abf634348213545564550c 100644
--- a/main-basop.yml
+++ b/main-basop.yml
@@ -1284,13 +1284,14 @@ renderer-pytest-on-merge-request:
 
     - exit_code=0
     - testcase_timeout=60
-    - python3 -m pytest -q --log-level ERROR -n auto -rA tests/renderer/test_renderer.py --create_ref --testcase_timeout=$testcase_timeout || exit_code=$?
+    - python3 tests/create_short_testvectors.py --cut_len 5.0 --all --inplace
+    - python3 -m pytest -q --log-level ERROR -n auto -rA tests/renderer_short/test_renderer.py --create_ref --testcase_timeout=$testcase_timeout || exit_code=$?
 
     ### Run test using branch scripts and input
     - if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
 
     # run test
-    - python3 -m pytest -q --log-level ERROR -n auto -rA --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML tests/renderer/test_renderer.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?
+    - python3 -m pytest -q --log-level ERROR -n auto -rA --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML tests/renderer_short/test_renderer.py --create_cut --testcase_timeout=$testcase_timeout || exit_code=$?
     - zero_errors=$(cat $REPORT_XML | grep -c 'errors="0"') || true
 
     - python3 scripts/parse_xml_report.py $REPORT_XML $REPORT_CSV
@@ -1396,6 +1397,8 @@ split-rendering-pytest-on-merge-request:
     - .test-job-linux-needs-testv-dir
     - .test-job-linux-compares-to-fixed-target
     - .rules-merge-request-no-draft
+  tags:
+    - ivas-basop-linux-fast
   timeout: "60 minutes"
   stage: compare
   variables:
@@ -1659,7 +1662,7 @@ renderer-smoke-test:
     - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
     - make -j IVAS_rend
     - testcase_timeout=60
-    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout
+    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
     expire_in: 1 week
@@ -1685,7 +1688,7 @@ renderer-asan:
     - cmake -B cmake-build -G "Unix Makefiles" -DCLANG=asan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
     - cmake --build cmake-build -- -j
     - testcase_timeout=180
-    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout
+    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
 
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
@@ -1714,7 +1717,7 @@ renderer-msan:
     - cmake -B cmake-build -G "Unix Makefiles" -DCLANG=msan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
     - cmake --build cmake-build -- -j
     - testcase_timeout=180
-    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout
+    - python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
 
   artifacts:
     name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"
@@ -1743,7 +1746,7 @@ renderer-usan:
     - cmake -B cmake-build -G "Unix Makefiles" -DCLANG=usan -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
     - cmake --build cmake-build -- -j
     - testcase_timeout=180
-    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1,log_path=usan_log_catchall python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer/test_renderer.py --testcase_timeout=$testcase_timeout
+    - UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1,log_path=usan_log_catchall python3 -m pytest -q -n auto -rA --junit-xml=report-junit.xml tests/renderer_short/test_renderer.py --testcase_timeout=$testcase_timeout
     - grep_exit_code=0
     - touch usan_log_empty # Creates an empty file, this is to avoid "grep: usan_log_*: No such file or directory" in case no USAN failures are reported from pytest
     - grep UndefinedBehaviorSanitizer usan_log_* || grep_exit_code=$?