diff --git a/tools/test_api.py b/tools/test_api.py
index 67acf706c9..be10beb603 100644
--- a/tools/test_api.py
+++ b/tools/test_api.py
@@ -2380,6 +2380,12 @@ def build_tests(tests, base_source_paths, build_path, target, toolchain_name,
 
 
 def test_spec_from_test_builds(test_builds):
+    for build in test_builds:
+        if Target.get_target(test_builds[build]['platform']).is_PSA_non_secure_target:
+            if test_builds[build]['platform'].endswith('_NS'):
+                test_builds[build]['platform'] = test_builds[build]['platform'][:-3]
+            if test_builds[build]['platform'].endswith('_PSA'):
+                test_builds[build]['platform'] = test_builds[build]['platform'][:-4]
     return {
         "builds": test_builds
     }