diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 91429ba..58fed95 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -87,8 +87,8 @@
                       "-DTEST_NS_CRYPTO=ON "),
     # Corstone1000 support
     "FVP"          : "-DPLATFORM_IS_FVP=True ",
-    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PS=OFF -DTEST_S_PLATFORM=OFF ",
-    "CS1K_TEST"    : ("-DTEST_S_IPC=OFF "
+    "FPGA"         : "-DPLATFORM_IS_FVP=False -DTEST_S_PLATFORM=OFF ",
+    "CS1K_TEST"    : ("-DTEST_S_PS=OFF "
                       "-DEXTRA_S_TEST_SUITE_PATH=%(codebase_root_dir)s/platform/ext/target/arm/corstone1000/ci_regression_tests/ "),
 
     # Extra test cases
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 4d7f4e4..fe7d80b 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -805,7 +805,7 @@
                 "tfm_platform":     ["arm/corstone1000"],
                 "compiler":         ["GCC_10_3"],
                 "isolation_level":  ["1"],
-                "test_regression":  ["RegBL2, RegS"],
+                "test_regression":  ["RegS"],
                 "test_psa_api":     ["OFF"],
                 "cmake_build_type": ["Debug"],
                 "with_bl2":         [True],