diff --git a/tests/arch/arm/arm_thread_swap/README.txt b/tests/arch/arm/arm_thread_swap/README.txt
index be4623f43fa..13fd8ebf3fc 100644
--- a/tests/arch/arm/arm_thread_swap/README.txt
+++ b/tests/arch/arm/arm_thread_swap/README.txt
@@ -17,12 +17,12 @@ behaves as expected. In particular, the test verifies that:
   space or FP shared registers) is saved and restored properly.
 
 Notes:
-  The test verifies the correct behavior of the thread contex-switch,
+  The test verifies the correct behavior of the thread context-switch,
   when it is triggered indirectly (by setting the PendSV interrupt
   to pending state), as well as when the thread itself triggers its
   swap-out (by calling z_arch_swap(.)).
 
-  The test is currently supported only in ARMv7-M and ARMv8-M Mainline
+  The test is currently supported in ARM Cortex-M Baseline and Mainline
   targets.
 
 
diff --git a/tests/arch/arm/arm_thread_swap/testcase.yaml b/tests/arch/arm/arm_thread_swap/testcase.yaml
index 89a41949aa8..443b27368be 100644
--- a/tests/arch/arm/arm_thread_swap/testcase.yaml
+++ b/tests/arch/arm/arm_thread_swap/testcase.yaml
@@ -1,11 +1,11 @@
 tests:
   arch.arm.swap.common:
     arch_whitelist: arm
-    filter: CONFIG_ARMV7_M_ARMV8_M_MAINLINE
+    filter: CONFIG_ARMV6_M_ARMV8_M_BASELINE or CONFIG_ARMV7_M_ARMV8_M_MAINLINE
     tags: arm
   arch.arm.swap.common.no_optimizations:
     arch_whitelist: arm
-    filter: CONFIG_ARMV7_M_ARMV8_M_MAINLINE
+    filter: CONFIG_ARMV6_M_ARMV8_M_BASELINE or CONFIG_ARMV7_M_ARMV8_M_MAINLINE
     extra_configs:
       - CONFIG_NO_OPTIMIZATIONS=y
     tags: arm