diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index b2976de..39436c8 100644
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -25,8 +25,7 @@
 config_AN521 = {"platform": ["AN521"],
                 "compiler": ["GNUARM"],
                 "config": ["ConfigRegression",
-                           "ConfigDefault",
-                           "ConfigCoreTest"],
+                           "ConfigDefault"],
                 "build": ["Debug"],
                 "with_mcuboot": [True],
                 # invalid configuations can be added as tuples of adjustable
diff --git a/lava_helper/lava_helper_configs.py b/lava_helper/lava_helper_configs.py
index c6e39ab..100b0ed 100644
--- a/lava_helper/lava_helper_configs.py
+++ b/lava_helper/lava_helper_configs.py
@@ -35,8 +35,6 @@
     # Remove all configs not requests by the caller
     if not default:
         tests.pop("Default")
-    if not core:
-        tests.pop("CoreTest")
     if not regression:
         tests.pop("Regression")
 
@@ -81,26 +79,6 @@
                 }  # Monitors
             ]
         },  # Default
-        'CoreTest': {
-            "recovery": "mps2_sse200_an512.tar.gz",
-            "binaries": {
-                "firmware": "install/outputs/AN521/tfm_sign.bin",
-                "bootloader": "install/outputs/AN521/mcuboot.bin"
-            },
-            "monitors": [
-                {
-                    'name': 'Non_Secure_Test_Suites_Summary',
-                    'start': 'TFM level is: 3',
-                    'end': 'End of Non-secure test suites',
-                    'pattern': r"[\x1b]\\[37mTest suite '"
-                               r"(?P<test_case_id>[^\n]+)' has [\x1b]\\[32m"
-                               r" (?P<result>PASSED|FAILED)",
-                    'fixup': {"pass": "PASSED", "fail": "FAILED"},
-                    'required': [
-                        "core_non_secure_positive_tests_tfm_core_test_1xxx_"]
-                }  # Monitors
-            ]
-        },  # CoreTest
         'Regression': {
             "recovery": "mps2_sse200_an512.tar.gz",
             "binaries": {
diff --git a/tfm_ci_pylib/tfm_builder.py b/tfm_ci_pylib/tfm_builder.py
index d34736f..37a1315 100644
--- a/tfm_ci_pylib/tfm_builder.py
+++ b/tfm_ci_pylib/tfm_builder.py
@@ -160,11 +160,7 @@
 
         else:
             binaries += [os.path.join(self._tfb_build_dir, "app", "tfm_ns")]
-            if "ConfigCoreTest" in self._tfb_build_dir:
-                binaries += [os.path.join(self._tfb_build_dir,
-                                          "unit_test", "tfm_s")]
-            else:
-                binaries += [os.path.join(self._tfb_build_dir, "app",
+            binaries += [os.path.join(self._tfb_build_dir, "app",
                                           "secure_fw", "tfm_s")]
             if self._tfb_cfg["WITH_MCUBOOT"]:
                 binaries += [os.path.join(self._tfb_build_dir,