diff --git a/build_helper/build_helper_configs.py b/build_helper/build_helper_configs.py
index aeb4fde..b8f2bb7 100755
--- a/build_helper/build_helper_configs.py
+++ b/build_helper/build_helper_configs.py
@@ -106,7 +106,7 @@
                                           "%(_tbm_build_dir_)s/postbuild.sh;"
                                           "pushd %(_tbm_build_dir_)s;"
                                           "BIN_FILES=$(grep -o '\/.*\.bin' TFM_UPDATE.sh | sed 's/^/bin/');"
-                                          "tar jcf ./bin/b_u585i_iot02a-tfm.tar.bz2 regression.sh TFM_UPDATE.sh ${BIN_FILES};"
+                                          "tar jcf ./bin/b_u5851_iot02a-tfm.tar.bz2 regression.sh TFM_UPDATE.sh ${BIN_FILES};"
                                           "popd")],
                   "nxp/lpcxpresso55s69": [("echo 'LPCXpresso55S69 board post process\n';"
                                             "if [ -f \"%(_tbm_build_dir_)s/bin/bl2.hex\" ]; then FLASH_FILE='flash_bl2_JLink.py'; else FLASH_FILE='flash_JLink.py'; fi;"
@@ -790,7 +790,14 @@
                 "extra_params":     [""]
                 },
                 "common_params": _common_tfm_builder_cfg,
-                "invalid": _common_tfm_invalid_configs + []
+                "invalid": _common_tfm_invalid_configs + [
+                    # all other tests are off when CRYPTO is ON
+                    ("stm/b_u585i_iot02a", "*", "*", True, "*",
+                     "*", "*", "*", "CRYPTO_ON"),
+                    # all other tests are ON when CRYPTO is OFF
+                    ("stm/stm32l562e_dk", "*", "*", False, "*",
+                     "*", "*", "*", "CRYPTO_OFF"),
+                ]
                 }
 
 config_nucleo_l552ze_q = {"seed_params": {