diff --git a/build_helper/build_helper_config_maps.py b/build_helper/build_helper_config_maps.py
index 8939719..8444b51 100644
--- a/build_helper/build_helper_config_maps.py
+++ b/build_helper/build_helper_config_maps.py
@@ -82,6 +82,9 @@
     "FPGA"         : "-DPLATFORM_IS_FVP=False ",
     "S_PS_OFF"     : "-DTEST_S_PS=OFF ",
 
+    # Extra test cases
+    "TEST_CBOR"    : "-DTEST_NS_QCBOR=ON ",
+
     # tf-m-extras example support
     "EXAMPLE_VAD"             : ("-DNS_EVALUATION_APP_PATH=%(codebase_root_dir)s/../tf-m-extras/examples/vad_an552/ns_side "
                                 "-DTFM_EXTRA_PARTITION_PATHS=%(codebase_root_dir)s/../tf-m-extras/partitions/vad_an552_sp/ "
diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index 9b611ee..8409ca7 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -324,7 +324,7 @@
                 "cmake_build_type": ["Debug", "Release", "Minsizerel"],
                 "with_bl2":         [True],
                 "profile":          [""],
-                "extra_params":     [""]
+                "extra_params":     ["TEST_CBOR"]
                 },
                 "common_params": _common_tfm_builder_cfg,
                 "valid": [