diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/CMakeLists.txt b/tests/kernel/threads/schedule_api/CMakeLists.txt
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/CMakeLists.txt
rename to tests/kernel/threads/schedule_api/CMakeLists.txt
diff --git a/tests/kernel/threads/scheduling/schedule_api/prj.conf b/tests/kernel/threads/schedule_api/prj.conf
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/prj.conf
rename to tests/kernel/threads/schedule_api/prj.conf
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/main.c b/tests/kernel/threads/schedule_api/src/main.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/main.c
rename to tests/kernel/threads/schedule_api/src/main.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_priority_scheduling.c b/tests/kernel/threads/schedule_api/src/test_priority_scheduling.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_priority_scheduling.c
rename to tests/kernel/threads/schedule_api/src/test_priority_scheduling.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_sched.h b/tests/kernel/threads/schedule_api/src/test_sched.h
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_sched.h
rename to tests/kernel/threads/schedule_api/src/test_sched.h
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_sched_is_preempt_thread.c b/tests/kernel/threads/schedule_api/src/test_sched_is_preempt_thread.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_sched_is_preempt_thread.c
rename to tests/kernel/threads/schedule_api/src/test_sched_is_preempt_thread.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_sched_priority.c b/tests/kernel/threads/schedule_api/src/test_sched_priority.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_sched_priority.c
rename to tests/kernel/threads/schedule_api/src/test_sched_priority.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_sched_timeslice_and_lock.c b/tests/kernel/threads/schedule_api/src/test_sched_timeslice_and_lock.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_sched_timeslice_and_lock.c
rename to tests/kernel/threads/schedule_api/src/test_sched_timeslice_and_lock.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_sched_timeslice_reset.c b/tests/kernel/threads/schedule_api/src/test_sched_timeslice_reset.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_sched_timeslice_reset.c
rename to tests/kernel/threads/schedule_api/src/test_sched_timeslice_reset.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/src/test_slice_scheduling.c b/tests/kernel/threads/schedule_api/src/test_slice_scheduling.c
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/src/test_slice_scheduling.c
rename to tests/kernel/threads/schedule_api/src/test_slice_scheduling.c
diff --git a/tests/kernel/threads/scheduling/schedule_api/testcase.yaml b/tests/kernel/threads/schedule_api/testcase.yaml
similarity index 65%
rename from tests/kernel/threads/scheduling/schedule_api/testcase.yaml
rename to tests/kernel/threads/schedule_api/testcase.yaml
index e3978949493..def4f99f8a8 100644
--- a/tests/kernel/threads/scheduling/schedule_api/testcase.yaml
+++ b/tests/kernel/threads/schedule_api/testcase.yaml
@@ -1,4 +1,4 @@
 tests:
-  kernel.threads.scheduling:
+  kernel.threads:
     min_ram: 20
     tags: kernel threads sched
diff --git a/tests/kernel/threads/lifecycle/thread_init/CMakeLists.txt b/tests/kernel/threads/thread_apis/CMakeLists.txt
similarity index 100%
rename from tests/kernel/threads/lifecycle/thread_init/CMakeLists.txt
rename to tests/kernel/threads/thread_apis/CMakeLists.txt
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/prj.conf b/tests/kernel/threads/thread_apis/prj.conf
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/prj.conf
rename to tests/kernel/threads/thread_apis/prj.conf
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/main.c b/tests/kernel/threads/thread_apis/src/main.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/src/main.c
rename to tests/kernel/threads/thread_apis/src/main.c
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_essential_thread.c b/tests/kernel/threads/thread_apis/src/test_essential_thread.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/src/test_essential_thread.c
rename to tests/kernel/threads/thread_apis/src/test_essential_thread.c
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_cancel_abort.c b/tests/kernel/threads/thread_apis/src/test_threads_cancel_abort.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_cancel_abort.c
rename to tests/kernel/threads/thread_apis/src/test_threads_cancel_abort.c
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_set_priority.c b/tests/kernel/threads/thread_apis/src/test_threads_set_priority.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_set_priority.c
rename to tests/kernel/threads/thread_apis/src/test_threads_set_priority.c
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_spawn.c b/tests/kernel/threads/thread_apis/src/test_threads_spawn.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_spawn.c
rename to tests/kernel/threads/thread_apis/src/test_threads_spawn.c
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_suspend_resume.c b/tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/src/test_threads_suspend_resume.c
rename to tests/kernel/threads/thread_apis/src/test_threads_suspend_resume.c
diff --git a/tests/kernel/threads/lifecycle/lifecycle_api/testcase.yaml b/tests/kernel/threads/thread_apis/testcase.yaml
similarity index 100%
rename from tests/kernel/threads/lifecycle/lifecycle_api/testcase.yaml
rename to tests/kernel/threads/thread_apis/testcase.yaml
diff --git a/tests/kernel/threads/scheduling/schedule_api/CMakeLists.txt b/tests/kernel/threads/thread_init/CMakeLists.txt
similarity index 100%
rename from tests/kernel/threads/scheduling/schedule_api/CMakeLists.txt
rename to tests/kernel/threads/thread_init/CMakeLists.txt
diff --git a/tests/kernel/threads/lifecycle/thread_init/prj.conf b/tests/kernel/threads/thread_init/prj.conf
similarity index 100%
rename from tests/kernel/threads/lifecycle/thread_init/prj.conf
rename to tests/kernel/threads/thread_init/prj.conf
diff --git a/tests/kernel/threads/lifecycle/thread_init/src/main.c b/tests/kernel/threads/thread_init/src/main.c
similarity index 100%
rename from tests/kernel/threads/lifecycle/thread_init/src/main.c
rename to tests/kernel/threads/thread_init/src/main.c
diff --git a/tests/kernel/threads/lifecycle/thread_init/testcase.yaml b/tests/kernel/threads/thread_init/testcase.yaml
similarity index 100%
rename from tests/kernel/threads/lifecycle/thread_init/testcase.yaml
rename to tests/kernel/threads/thread_init/testcase.yaml