diff --git a/tools/build.py b/tools/build.py
index 5c2d4aa064..cedf29ac3a 100644
--- a/tools/build.py
+++ b/tools/build.py
@@ -191,14 +191,12 @@ def main():
                     profile = extract_profile(parser, options, internal_tc_name)
 
                     if options.source_dir:
-                        if target.is_PSA_target:
+                        resource_filter = None
+                        if target.is_PSA_secure_target:
                             generate_psa_sources(
                                 source_dirs=options.source_dir,
                                 ignore_paths=[options.build_dir]
                             )
-
-                        resource_filter = None
-                        if target.is_PSA_secure_target:
                             resource_filter = OsAndSpeResourceFilter()
 
                         lib_build_res = build_library(
diff --git a/tools/make.py b/tools/make.py
index 6fd8ee9b98..ed021be324 100644
--- a/tools/make.py
+++ b/tools/make.py
@@ -339,14 +339,12 @@ def main():
             args_error(parser, str(e))
 
         if options.source_dir is not None:
-            if target.is_PSA_target:
+            resource_filter = None
+            if target.is_PSA_secure_target:
                 generate_psa_sources(
                     source_dirs=options.source_dir,
                     ignore_paths=[options.build_dir]
                 )
-
-            resource_filter = None
-            if target.is_PSA_secure_target:
                 resource_filter = OsAndSpeResourceFilter()
 
             wrapped_build_project(
diff --git a/tools/project.py b/tools/project.py
index 1bf47693e9..05a73cdc8f 100644
--- a/tools/project.py
+++ b/tools/project.py
@@ -391,13 +391,11 @@ def main():
 
         try:
             target = Target.get_target(mcu)
-            if target.is_PSA_target:
+            resource_filter = None
+            if target.is_PSA_secure_target:
                 generate_psa_sources(source_dirs=options.source_dir,
                                      ignore_paths=[]
                 )
-
-            resource_filter = None
-            if target.is_PSA_secure_target:
                 resource_filter = OsAndSpeResourceFilter()
 
             export(
diff --git a/tools/test.py b/tools/test.py
index 5de76bed7f..2ac70440f4 100644
--- a/tools/test.py
+++ b/tools/test.py
@@ -243,8 +243,6 @@ def main():
                 resource_filter = None
                 if target.is_PSA_secure_target:
                     resource_filter = OsAndSpeResourceFilter()
-
-                if target.is_PSA_target:
                     generate_psa_sources(
                         source_dirs=base_source_paths,
                         ignore_paths=[options.build_dir]