diff --git a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json
index 771fb9411a..d54f6e3958 100644
--- a/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json
+++ b/components/TARGET_PSA/TARGET_TFM/COMPONENT_SPE/mbed_lib.json
@@ -1,4 +1,11 @@
 {
     "name": "tfm-s",
-    "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"]
+    "macros": ["MBED_FAULT_HANDLER_DISABLED", "BYPASS_NVSTORE_CHECK=1"],
+    "config": {
+        "max_ns_thread_count": {
+            "help": "maximum allowed number of non-secure threads",
+            "macro_name": "TFM_MAX_NS_THREAD_COUNT",
+            "value": 10
+        }
+    }
 }
diff --git a/features/storage/TESTS/blockdevice/general_block_device/main.cpp b/features/storage/TESTS/blockdevice/general_block_device/main.cpp
index a91715c5aa..9e58c5927e 100644
--- a/features/storage/TESTS/blockdevice/general_block_device/main.cpp
+++ b/features/storage/TESTS/blockdevice/general_block_device/main.cpp
@@ -51,7 +51,7 @@ using namespace utest::v1;
 
 #define TEST_BLOCK_COUNT 10
 #define TEST_ERROR_MASK 16
-#define TEST_NUM_OF_THREADS 4
+#define TEST_NUM_OF_THREADS 5
 #define TEST_THREAD_STACK_SIZE 1024
 
 const struct {