diff --git a/tests/kernel/mem_pool/test_mpool/Makefile b/tests/kernel/mem_pool/mem_pool/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool/Makefile
rename to tests/kernel/mem_pool/mem_pool/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool/README.txt b/tests/kernel/mem_pool/mem_pool/README.txt
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool/README.txt
rename to tests/kernel/mem_pool/mem_pool/README.txt
diff --git a/tests/kernel/mem_pool/test_mpool/prj.conf b/tests/kernel/mem_pool/mem_pool/prj.conf
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool/prj.conf
rename to tests/kernel/mem_pool/mem_pool/prj.conf
diff --git a/tests/kernel/mem_pool/test_mpool/src/Makefile b/tests/kernel/mem_pool/mem_pool/src/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool/src/Makefile
rename to tests/kernel/mem_pool/mem_pool/src/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool/src/pool.c b/tests/kernel/mem_pool/mem_pool/src/pool.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool/src/pool.c
rename to tests/kernel/mem_pool/mem_pool/src/pool.c
diff --git a/tests/kernel/mem_pool/test_mpool/testcase.ini b/tests/kernel/mem_pool/mem_pool/testcase.ini
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool/testcase.ini
rename to tests/kernel/mem_pool/mem_pool/testcase.ini
diff --git a/tests/kernel/mem_pool/test_mpool_api/Makefile b/tests/kernel/mem_pool/mem_pool_api/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/Makefile
rename to tests/kernel/mem_pool/mem_pool_api/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool_api/prj.conf b/tests/kernel/mem_pool/mem_pool_api/prj.conf
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/prj.conf
rename to tests/kernel/mem_pool/mem_pool_api/prj.conf
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/Makefile b/tests/kernel/mem_pool/mem_pool_api/src/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/src/Makefile
rename to tests/kernel/mem_pool/mem_pool_api/src/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/main.c b/tests/kernel/mem_pool/mem_pool_api/src/main.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/src/main.c
rename to tests/kernel/mem_pool/mem_pool_api/src/main.c
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool.h b/tests/kernel/mem_pool/mem_pool_api/src/test_mpool.h
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/src/test_mpool.h
rename to tests/kernel/mem_pool/mem_pool_api/src/test_mpool.h
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_api.c b/tests/kernel/mem_pool/mem_pool_api/src/test_mpool_api.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/src/test_mpool_api.c
rename to tests/kernel/mem_pool/mem_pool_api/src/test_mpool_api.c
diff --git a/tests/kernel/mem_pool/test_mpool_api/src/test_mpool_extern.c b/tests/kernel/mem_pool/mem_pool_api/src/test_mpool_extern.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/src/test_mpool_extern.c
rename to tests/kernel/mem_pool/mem_pool_api/src/test_mpool_extern.c
diff --git a/tests/kernel/mem_pool/test_mpool_api/testcase.ini b/tests/kernel/mem_pool/mem_pool_api/testcase.ini
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_api/testcase.ini
rename to tests/kernel/mem_pool/mem_pool_api/testcase.ini
diff --git a/tests/kernel/mem_pool/test_mpool_concept/Makefile b/tests/kernel/mem_pool/mem_pool_concept/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/Makefile
rename to tests/kernel/mem_pool/mem_pool_concept/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool_concept/prj.conf b/tests/kernel/mem_pool/mem_pool_concept/prj.conf
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/prj.conf
rename to tests/kernel/mem_pool/mem_pool_concept/prj.conf
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/Makefile b/tests/kernel/mem_pool/mem_pool_concept/src/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/Makefile
rename to tests/kernel/mem_pool/mem_pool_concept/src/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/main.c b/tests/kernel/mem_pool/mem_pool_concept/src/main.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/main.c
rename to tests/kernel/mem_pool/mem_pool_concept/src/main.c
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool.h b/tests/kernel/mem_pool/mem_pool_concept/src/test_mpool.h
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/test_mpool.h
rename to tests/kernel/mem_pool/mem_pool_concept/src/test_mpool.h
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_size.c b/tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_alloc_size.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_size.c
rename to tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_alloc_size.c
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_wait.c b/tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_alloc_wait.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_alloc_wait.c
rename to tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_alloc_wait.c
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_parent.c b/tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_merge_fail_diff_parent.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_parent.c
rename to tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_merge_fail_diff_parent.c
diff --git a/tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_size.c b/tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_merge_fail_diff_size.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/src/test_mpool_merge_fail_diff_size.c
rename to tests/kernel/mem_pool/mem_pool_concept/src/test_mpool_merge_fail_diff_size.c
diff --git a/tests/kernel/mem_pool/test_mpool_concept/testcase.ini b/tests/kernel/mem_pool/mem_pool_concept/testcase.ini
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_concept/testcase.ini
rename to tests/kernel/mem_pool/mem_pool_concept/testcase.ini
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/Makefile b/tests/kernel/mem_pool/mem_pool_threadsafe/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_threadsafe/Makefile
rename to tests/kernel/mem_pool/mem_pool_threadsafe/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/prj.conf b/tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_threadsafe/prj.conf
rename to tests/kernel/mem_pool/mem_pool_threadsafe/prj.conf
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/src/Makefile b/tests/kernel/mem_pool/mem_pool_threadsafe/src/Makefile
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_threadsafe/src/Makefile
rename to tests/kernel/mem_pool/mem_pool_threadsafe/src/Makefile
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/src/main.c b/tests/kernel/mem_pool/mem_pool_threadsafe/src/main.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_threadsafe/src/main.c
rename to tests/kernel/mem_pool/mem_pool_threadsafe/src/main.c
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c b/tests/kernel/mem_pool/mem_pool_threadsafe/src/test_mpool_threadsafe.c
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_threadsafe/src/test_mpool_threadsafe.c
rename to tests/kernel/mem_pool/mem_pool_threadsafe/src/test_mpool_threadsafe.c
diff --git a/tests/kernel/mem_pool/test_mpool_threadsafe/testcase.ini b/tests/kernel/mem_pool/mem_pool_threadsafe/testcase.ini
similarity index 100%
rename from tests/kernel/mem_pool/test_mpool_threadsafe/testcase.ini
rename to tests/kernel/mem_pool/mem_pool_threadsafe/testcase.ini