diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/Makefile b/tests/kernel/threads/lifecycle/lifecycle_api/Makefile similarity index 100% rename from tests/kernel/threads_lifecycle/lifecycle_api/Makefile rename to tests/kernel/threads/lifecycle/lifecycle_api/Makefile diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/prj.conf b/tests/kernel/threads/lifecycle/lifecycle_api/prj.conf similarity index 100% rename from tests/kernel/threads_lifecycle/lifecycle_api/prj.conf rename to tests/kernel/threads/lifecycle/lifecycle_api/prj.conf diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/Makefile b/tests/kernel/threads/lifecycle/lifecycle_api/src/Makefile similarity index 100% rename from tests/kernel/threads_lifecycle/lifecycle_api/src/Makefile rename to tests/kernel/threads/lifecycle/lifecycle_api/src/Makefile diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/main.c b/tests/kernel/threads/lifecycle/lifecycle_api/src/main.c similarity index 100% rename from tests/kernel/threads_lifecycle/lifecycle_api/src/main.c rename to tests/kernel/threads/lifecycle/lifecycle_api/src/main.c diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_cancel_abort.c b/tests/kernel/threads/lifecycle/lifecycle_api/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/lifecycle/lifecycle_api/src/test_threads_cancel_abort.c diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_spawn.c b/tests/kernel/threads/lifecycle/lifecycle_api/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/lifecycle/lifecycle_api/src/test_threads_spawn.c diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/src/test_threads_suspend_resume.c b/tests/kernel/threads/lifecycle/lifecycle_api/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/lifecycle/lifecycle_api/src/test_threads_suspend_resume.c diff --git a/tests/kernel/threads_lifecycle/lifecycle_api/testcase.ini b/tests/kernel/threads/lifecycle/lifecycle_api/testcase.ini similarity index 100% rename from tests/kernel/threads_lifecycle/lifecycle_api/testcase.ini rename to tests/kernel/threads/lifecycle/lifecycle_api/testcase.ini diff --git a/tests/kernel/threads_lifecycle/thread_init/Makefile b/tests/kernel/threads/lifecycle/thread_init/Makefile similarity index 100% rename from tests/kernel/threads_lifecycle/thread_init/Makefile rename to tests/kernel/threads/lifecycle/thread_init/Makefile diff --git a/tests/kernel/threads_lifecycle/thread_init/prj.conf b/tests/kernel/threads/lifecycle/thread_init/prj.conf similarity index 100% rename from tests/kernel/threads_lifecycle/thread_init/prj.conf rename to tests/kernel/threads/lifecycle/thread_init/prj.conf diff --git a/tests/kernel/threads_lifecycle/thread_init/src/Makefile b/tests/kernel/threads/lifecycle/thread_init/src/Makefile similarity index 100% rename from tests/kernel/threads_lifecycle/thread_init/src/Makefile rename to tests/kernel/threads/lifecycle/thread_init/src/Makefile diff --git a/tests/kernel/threads_lifecycle/thread_init/src/main.c b/tests/kernel/threads/lifecycle/thread_init/src/main.c similarity index 100% rename from tests/kernel/threads_lifecycle/thread_init/src/main.c rename to tests/kernel/threads/lifecycle/thread_init/src/main.c diff --git a/tests/kernel/threads_lifecycle/thread_init/src/test_thread_init.c b/tests/kernel/threads/lifecycle/thread_init/src/test_thread_init.c similarity index 100% rename from tests/kernel/threads_lifecycle/thread_init/src/test_thread_init.c rename to tests/kernel/threads/lifecycle/thread_init/src/test_thread_init.c diff --git a/tests/kernel/threads_lifecycle/thread_init/testcase.ini b/tests/kernel/threads/lifecycle/thread_init/testcase.ini similarity index 100% rename from tests/kernel/threads_lifecycle/thread_init/testcase.ini rename to tests/kernel/threads/lifecycle/thread_init/testcase.ini