diff --git a/tests/kernel/test_arm_irq_vector_table/Makefile b/tests/kernel/arm_irq_vector_table/Makefile
similarity index 100%
rename from tests/kernel/test_arm_irq_vector_table/Makefile
rename to tests/kernel/arm_irq_vector_table/Makefile
diff --git a/tests/kernel/test_arm_irq_vector_table/README.txt b/tests/kernel/arm_irq_vector_table/README.txt
similarity index 100%
rename from tests/kernel/test_arm_irq_vector_table/README.txt
rename to tests/kernel/arm_irq_vector_table/README.txt
diff --git a/tests/kernel/test_arm_irq_vector_table/prj.conf b/tests/kernel/arm_irq_vector_table/prj.conf
similarity index 100%
rename from tests/kernel/test_arm_irq_vector_table/prj.conf
rename to tests/kernel/arm_irq_vector_table/prj.conf
diff --git a/tests/kernel/test_arm_irq_vector_table/src/Makefile b/tests/kernel/arm_irq_vector_table/src/Makefile
similarity index 100%
rename from tests/kernel/test_arm_irq_vector_table/src/Makefile
rename to tests/kernel/arm_irq_vector_table/src/Makefile
diff --git a/tests/kernel/test_arm_irq_vector_table/src/main.c b/tests/kernel/arm_irq_vector_table/src/main.c
similarity index 100%
rename from tests/kernel/test_arm_irq_vector_table/src/main.c
rename to tests/kernel/arm_irq_vector_table/src/main.c
diff --git a/tests/kernel/test_arm_irq_vector_table/testcase.ini b/tests/kernel/arm_irq_vector_table/testcase.ini
similarity index 100%
rename from tests/kernel/test_arm_irq_vector_table/testcase.ini
rename to tests/kernel/arm_irq_vector_table/testcase.ini
diff --git a/tests/kernel/test_arm_runtime_nmi/Makefile b/tests/kernel/arm_runtime_nmi/Makefile
similarity index 100%
rename from tests/kernel/test_arm_runtime_nmi/Makefile
rename to tests/kernel/arm_runtime_nmi/Makefile
diff --git a/tests/kernel/test_arm_runtime_nmi/README.txt b/tests/kernel/arm_runtime_nmi/README.txt
similarity index 100%
rename from tests/kernel/test_arm_runtime_nmi/README.txt
rename to tests/kernel/arm_runtime_nmi/README.txt
diff --git a/tests/kernel/test_arm_runtime_nmi/prj.conf b/tests/kernel/arm_runtime_nmi/prj.conf
similarity index 100%
rename from tests/kernel/test_arm_runtime_nmi/prj.conf
rename to tests/kernel/arm_runtime_nmi/prj.conf
diff --git a/tests/kernel/test_arm_runtime_nmi/src/Makefile b/tests/kernel/arm_runtime_nmi/src/Makefile
similarity index 100%
rename from tests/kernel/test_arm_runtime_nmi/src/Makefile
rename to tests/kernel/arm_runtime_nmi/src/Makefile
diff --git a/tests/kernel/test_arm_runtime_nmi/src/main.c b/tests/kernel/arm_runtime_nmi/src/main.c
similarity index 100%
rename from tests/kernel/test_arm_runtime_nmi/src/main.c
rename to tests/kernel/arm_runtime_nmi/src/main.c
diff --git a/tests/kernel/test_arm_runtime_nmi/testcase.ini b/tests/kernel/arm_runtime_nmi/testcase.ini
similarity index 100%
rename from tests/kernel/test_arm_runtime_nmi/testcase.ini
rename to tests/kernel/arm_runtime_nmi/testcase.ini
diff --git a/tests/kernel/test_bitfield/Makefile b/tests/kernel/bitfield/Makefile
similarity index 100%
rename from tests/kernel/test_bitfield/Makefile
rename to tests/kernel/bitfield/Makefile
diff --git a/tests/kernel/test_bitfield/src/Makefile b/tests/kernel/bitfield/src/Makefile
similarity index 100%
rename from tests/kernel/test_bitfield/src/Makefile
rename to tests/kernel/bitfield/src/Makefile
diff --git a/tests/kernel/test_bitfield/src/bitfield.c b/tests/kernel/bitfield/src/bitfield.c
similarity index 100%
rename from tests/kernel/test_bitfield/src/bitfield.c
rename to tests/kernel/bitfield/src/bitfield.c
diff --git a/tests/kernel/test_bitfield/testcase.ini b/tests/kernel/bitfield/testcase.ini
similarity index 100%
rename from tests/kernel/test_bitfield/testcase.ini
rename to tests/kernel/bitfield/testcase.ini
diff --git a/tests/kernel/test_common/Makefile b/tests/kernel/common/Makefile
similarity index 100%
rename from tests/kernel/test_common/Makefile
rename to tests/kernel/common/Makefile
diff --git a/tests/kernel/test_common/prj.conf b/tests/kernel/common/prj.conf
similarity index 100%
rename from tests/kernel/test_common/prj.conf
rename to tests/kernel/common/prj.conf
diff --git a/tests/kernel/test_common/src/Makefile b/tests/kernel/common/src/Makefile
similarity index 100%
rename from tests/kernel/test_common/src/Makefile
rename to tests/kernel/common/src/Makefile
diff --git a/tests/kernel/test_common/src/atomic.c b/tests/kernel/common/src/atomic.c
similarity index 100%
rename from tests/kernel/test_common/src/atomic.c
rename to tests/kernel/common/src/atomic.c
diff --git a/tests/kernel/test_common/src/bitfield.c b/tests/kernel/common/src/bitfield.c
similarity index 100%
rename from tests/kernel/test_common/src/bitfield.c
rename to tests/kernel/common/src/bitfield.c
diff --git a/tests/kernel/test_common/src/byteorder.c b/tests/kernel/common/src/byteorder.c
similarity index 100%
rename from tests/kernel/test_common/src/byteorder.c
rename to tests/kernel/common/src/byteorder.c
diff --git a/tests/kernel/test_common/src/intmath.c b/tests/kernel/common/src/intmath.c
similarity index 100%
rename from tests/kernel/test_common/src/intmath.c
rename to tests/kernel/common/src/intmath.c
diff --git a/tests/kernel/test_common/src/main.c b/tests/kernel/common/src/main.c
similarity index 100%
rename from tests/kernel/test_common/src/main.c
rename to tests/kernel/common/src/main.c
diff --git a/tests/kernel/test_common/src/printk.c b/tests/kernel/common/src/printk.c
similarity index 100%
rename from tests/kernel/test_common/src/printk.c
rename to tests/kernel/common/src/printk.c
diff --git a/tests/kernel/test_common/src/rand32.c b/tests/kernel/common/src/rand32.c
similarity index 100%
rename from tests/kernel/test_common/src/rand32.c
rename to tests/kernel/common/src/rand32.c
diff --git a/tests/kernel/test_common/src/ring_buf.c b/tests/kernel/common/src/ring_buf.c
similarity index 100%
rename from tests/kernel/test_common/src/ring_buf.c
rename to tests/kernel/common/src/ring_buf.c
diff --git a/tests/kernel/test_common/src/slist.c b/tests/kernel/common/src/slist.c
similarity index 100%
rename from tests/kernel/test_common/src/slist.c
rename to tests/kernel/common/src/slist.c
diff --git a/tests/kernel/test_common/testcase.ini b/tests/kernel/common/testcase.ini
similarity index 100%
rename from tests/kernel/test_common/testcase.ini
rename to tests/kernel/common/testcase.ini
diff --git a/tests/kernel/test_ipm/Makefile b/tests/kernel/ipm/Makefile
similarity index 100%
rename from tests/kernel/test_ipm/Makefile
rename to tests/kernel/ipm/Makefile
diff --git a/tests/kernel/test_ipm/prj.conf b/tests/kernel/ipm/prj.conf
similarity index 100%
rename from tests/kernel/test_ipm/prj.conf
rename to tests/kernel/ipm/prj.conf
diff --git a/tests/kernel/test_ipm/src/Makefile b/tests/kernel/ipm/src/Makefile
similarity index 100%
rename from tests/kernel/test_ipm/src/Makefile
rename to tests/kernel/ipm/src/Makefile
diff --git a/tests/kernel/test_ipm/src/ipm_dummy.c b/tests/kernel/ipm/src/ipm_dummy.c
similarity index 100%
rename from tests/kernel/test_ipm/src/ipm_dummy.c
rename to tests/kernel/ipm/src/ipm_dummy.c
diff --git a/tests/kernel/test_ipm/src/ipm_dummy.h b/tests/kernel/ipm/src/ipm_dummy.h
similarity index 100%
rename from tests/kernel/test_ipm/src/ipm_dummy.h
rename to tests/kernel/ipm/src/ipm_dummy.h
diff --git a/tests/kernel/test_ipm/src/main.c b/tests/kernel/ipm/src/main.c
similarity index 100%
rename from tests/kernel/test_ipm/src/main.c
rename to tests/kernel/ipm/src/main.c
diff --git a/tests/kernel/test_ipm/testcase.ini b/tests/kernel/ipm/testcase.ini
similarity index 100%
rename from tests/kernel/test_ipm/testcase.ini
rename to tests/kernel/ipm/testcase.ini
diff --git a/tests/kernel/test_multilib/Makefile b/tests/kernel/multilib/Makefile
similarity index 100%
rename from tests/kernel/test_multilib/Makefile
rename to tests/kernel/multilib/Makefile
diff --git a/tests/kernel/test_multilib/README.txt b/tests/kernel/multilib/README.txt
similarity index 100%
rename from tests/kernel/test_multilib/README.txt
rename to tests/kernel/multilib/README.txt
diff --git a/tests/kernel/test_multilib/prj.conf b/tests/kernel/multilib/prj.conf
similarity index 100%
rename from tests/kernel/test_multilib/prj.conf
rename to tests/kernel/multilib/prj.conf
diff --git a/tests/kernel/test_multilib/src/Makefile b/tests/kernel/multilib/src/Makefile
similarity index 100%
rename from tests/kernel/test_multilib/src/Makefile
rename to tests/kernel/multilib/src/Makefile
diff --git a/tests/kernel/test_multilib/src/test_multilib.c b/tests/kernel/multilib/src/test_multilib.c
similarity index 100%
rename from tests/kernel/test_multilib/src/test_multilib.c
rename to tests/kernel/multilib/src/test_multilib.c
diff --git a/tests/kernel/test_multilib/testcase.ini b/tests/kernel/multilib/testcase.ini
similarity index 100%
rename from tests/kernel/test_multilib/testcase.ini
rename to tests/kernel/multilib/testcase.ini
diff --git a/tests/kernel/test_sprintf/Makefile b/tests/kernel/sprintf/Makefile
similarity index 100%
rename from tests/kernel/test_sprintf/Makefile
rename to tests/kernel/sprintf/Makefile
diff --git a/tests/kernel/test_sprintf/README.txt b/tests/kernel/sprintf/README.txt
similarity index 100%
rename from tests/kernel/test_sprintf/README.txt
rename to tests/kernel/sprintf/README.txt
diff --git a/tests/kernel/test_sprintf/prj.conf b/tests/kernel/sprintf/prj.conf
similarity index 100%
rename from tests/kernel/test_sprintf/prj.conf
rename to tests/kernel/sprintf/prj.conf
diff --git a/tests/kernel/test_sprintf/src/Makefile b/tests/kernel/sprintf/src/Makefile
similarity index 100%
rename from tests/kernel/test_sprintf/src/Makefile
rename to tests/kernel/sprintf/src/Makefile
diff --git a/tests/kernel/test_sprintf/src/test_sprintf.c b/tests/kernel/sprintf/src/test_sprintf.c
similarity index 100%
rename from tests/kernel/test_sprintf/src/test_sprintf.c
rename to tests/kernel/sprintf/src/test_sprintf.c
diff --git a/tests/kernel/test_sprintf/testcase.ini b/tests/kernel/sprintf/testcase.ini
similarity index 100%
rename from tests/kernel/test_sprintf/testcase.ini
rename to tests/kernel/sprintf/testcase.ini
diff --git a/tests/kernel/test_xip/Makefile b/tests/kernel/xip/Makefile
similarity index 100%
rename from tests/kernel/test_xip/Makefile
rename to tests/kernel/xip/Makefile
diff --git a/tests/kernel/test_xip/README.txt b/tests/kernel/xip/README.txt
similarity index 100%
rename from tests/kernel/test_xip/README.txt
rename to tests/kernel/xip/README.txt
diff --git a/tests/kernel/test_xip/prj.conf b/tests/kernel/xip/prj.conf
similarity index 100%
rename from tests/kernel/test_xip/prj.conf
rename to tests/kernel/xip/prj.conf
diff --git a/tests/kernel/test_xip/src/Makefile b/tests/kernel/xip/src/Makefile
similarity index 100%
rename from tests/kernel/test_xip/src/Makefile
rename to tests/kernel/xip/src/Makefile
diff --git a/tests/kernel/test_xip/src/test.h b/tests/kernel/xip/src/test.h
similarity index 100%
rename from tests/kernel/test_xip/src/test.h
rename to tests/kernel/xip/src/test.h
diff --git a/tests/kernel/test_xip/src/test_xip.c b/tests/kernel/xip/src/test_xip.c
similarity index 100%
rename from tests/kernel/test_xip/src/test_xip.c
rename to tests/kernel/xip/src/test_xip.c
diff --git a/tests/kernel/test_xip/src/test_xip_helper.c b/tests/kernel/xip/src/test_xip_helper.c
similarity index 100%
rename from tests/kernel/test_xip/src/test_xip_helper.c
rename to tests/kernel/xip/src/test_xip_helper.c
diff --git a/tests/kernel/test_xip/testcase.ini b/tests/kernel/xip/testcase.ini
similarity index 100%
rename from tests/kernel/test_xip/testcase.ini
rename to tests/kernel/xip/testcase.ini