diff --git a/tests/kernel/test_tickless/Makefile b/tests/kernel/tickless/tickless/Makefile
similarity index 100%
rename from tests/kernel/test_tickless/Makefile
rename to tests/kernel/tickless/tickless/Makefile
diff --git a/tests/kernel/test_tickless/README.txt b/tests/kernel/tickless/tickless/README.txt
similarity index 100%
rename from tests/kernel/test_tickless/README.txt
rename to tests/kernel/tickless/tickless/README.txt
diff --git a/tests/kernel/test_tickless/prj.conf b/tests/kernel/tickless/tickless/prj.conf
similarity index 100%
rename from tests/kernel/test_tickless/prj.conf
rename to tests/kernel/tickless/tickless/prj.conf
diff --git a/tests/kernel/test_tickless/src/Makefile b/tests/kernel/tickless/tickless/src/Makefile
similarity index 100%
rename from tests/kernel/test_tickless/src/Makefile
rename to tests/kernel/tickless/tickless/src/Makefile
diff --git a/tests/kernel/test_tickless/src/test_tickless.c b/tests/kernel/tickless/tickless/src/test_tickless.c
similarity index 100%
rename from tests/kernel/test_tickless/src/test_tickless.c
rename to tests/kernel/tickless/tickless/src/test_tickless.c
diff --git a/tests/kernel/test_tickless/src/timestamps.c b/tests/kernel/tickless/tickless/src/timestamps.c
similarity index 100%
rename from tests/kernel/test_tickless/src/timestamps.c
rename to tests/kernel/tickless/tickless/src/timestamps.c
diff --git a/tests/kernel/test_tickless/testcase.ini b/tests/kernel/tickless/tickless/testcase.ini
similarity index 100%
rename from tests/kernel/test_tickless/testcase.ini
rename to tests/kernel/tickless/tickless/testcase.ini