diff --git a/tests/kernel/threads/thread_error_case/testcase.yaml b/tests/kernel/threads/thread_error_case/testcase.yaml
index 69106b0f61171..171bc8b3b6eab 100644
--- a/tests/kernel/threads/thread_error_case/testcase.yaml
+++ b/tests/kernel/threads/thread_error_case/testcase.yaml
@@ -4,7 +4,7 @@ tests:
       - kernel
       - threads
       - userspace
-    filter: CONFIG_USERSPACE
+    filter: CONFIG_ARCH_HAS_USERSPACE
     ignore_faults: true
     integration_platforms:
       - qemu_x86
diff --git a/tests/ztest/base/testcase.yaml b/tests/ztest/base/testcase.yaml
index 2b6107cd20482..eb88b48786f02 100644
--- a/tests/ztest/base/testcase.yaml
+++ b/tests/ztest/base/testcase.yaml
@@ -16,7 +16,7 @@ tests:
     integration_platforms:
       - native_sim
   testing.ztest.base.verbose_0_userspace:
-    filter: CONFIG_USERSPACE
+    filter: CONFIG_ARCH_HAS_USERSPACE
     extra_args: CONF_FILE=prj_verbose_0.conf
     tags:
       - userspace