diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b50bb1156509c724e72f7b549b33a118b956610b..a34939ac4236af6c4763a946c10f8d7867f3c8e3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -235,7 +235,6 @@ branch-is-up-to-date-with-main-post:
     - ivas-linux-fast
   before_script:
     - !reference [.job-linux, before_script]
-    - python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm
     - python3 tests/create_short_testvectors.py
     - python3 scripts/prepare_combined_format_inputs.py
 
@@ -250,7 +249,11 @@ branch-is-up-to-date-with-main-post:
     # hack for renderer tests to match the expected naming
     - mv IVAS_rend IVAS_rend_ref
 
-    - python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout
+    - if [ "$BASOP_BRANCH" == "ivas-float-update" ]; then
+    -   python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref -k "not rtpdump" --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout
+    - else
+    -   python3 -m pytest $TEST_SUITE $PYTEST_ARGS --update_ref 1 --create_ref --ref_encoder_path IVAS_cod --ref_decoder_path IVAS_dec --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout
+    - fi
 
   artifacts:
     name: "$CI_JOB_NAME--sha-$CI_COMMIT_SHORT_SHA--results"
@@ -418,7 +421,6 @@ codec-smoke-test:
     # for MRs to basop-ci-branch-pc, we want to test with the BASOP float reference build
     # per default, the smoke test builds the current repo again with WMOPS activated to catch unbalanced instrumentation macros
     - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" = "basop-ci-branch" ]; then
-    -   python3 scripts/smoketest-basop-filter.py scripts/config/ivas_modes.json --inline
     -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/float/build-binaries-from-basop-repo.sh ivas-float-update
     -   bash ci/smoke_test.sh coverage
     - else
diff --git a/scripts/generate_scripts_from_regressions.py b/scripts/generate_scripts_from_regressions.py
index 4487f844804902bf53727ed2ec20f178c5988416..e772d6b719ff9e62a83c210c1b114df98fda3193 100644
--- a/scripts/generate_scripts_from_regressions.py
+++ b/scripts/generate_scripts_from_regressions.py
@@ -65,7 +65,6 @@ mv IVAS_rend IVAS_rend_2
 # Get fresh copy of scripts, tests and ci
 cp -r $SCRIPTS_DIR/{{scripts,tests,ci,pytest.ini}} .
 rm -rf tests/ref tests/dut tests/renderer/ref tests/renderer/cut
-python3 ci/remove_unsupported_testcases.py scripts/config/self_test.prm scripts/config/self_test_ltv.prm
 
 # Get LTVs
 cp $LTV_DIR/* scripts/testv
@@ -96,11 +95,9 @@ python3 scripts/parse_xml_report.py report2.xml report2.csv
 
 
 def main(critical_list):
-
     critical = pd.read_csv(critical_list, sep=";")
-                       
-    for row_counter, row in critical.iterrows():
 
+    for row_counter, row in critical.iterrows():
         # Find level
         level_scaling = 1.0
         if "lev+10" in row["job"]:
@@ -140,12 +137,15 @@ def main(critical_list):
             DUT_DEC2=DUT_DEC2,
         )
 
-        script_filename = f"regression_{row_counter+2:03d}.bash"
+        script_filename = f"regression_{row_counter + 2:03d}.bash"
         with open(script_filename, "w") as f:
             f.write(script_content)
 
+
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="Generate bash scripts to reproduce test cases from critical testcase csv list")
+    parser = argparse.ArgumentParser(
+        description="Generate bash scripts to reproduce test cases from critical testcase csv list"
+    )
     parser.add_argument(
         "critical_list",
         type=str,