diff --git a/tests/kernel/fifo/test_fifo_api/Makefile b/tests/kernel/fifo/fifo_api/Makefile
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/Makefile
rename to tests/kernel/fifo/fifo_api/Makefile
diff --git a/tests/kernel/fifo/test_fifo_api/prj.conf b/tests/kernel/fifo/fifo_api/prj.conf
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/prj.conf
rename to tests/kernel/fifo/fifo_api/prj.conf
diff --git a/tests/kernel/fifo/test_fifo_api/src/Makefile b/tests/kernel/fifo/fifo_api/src/Makefile
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/Makefile
rename to tests/kernel/fifo/fifo_api/src/Makefile
diff --git a/tests/kernel/fifo/test_fifo_api/src/main.c b/tests/kernel/fifo/fifo_api/src/main.c
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/main.c
rename to tests/kernel/fifo/fifo_api/src/main.c
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo.h b/tests/kernel/fifo/fifo_api/src/test_fifo.h
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/test_fifo.h
rename to tests/kernel/fifo/fifo_api/src/test_fifo.h
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo_cancel.c b/tests/kernel/fifo/fifo_api/src/test_fifo_cancel.c
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/test_fifo_cancel.c
rename to tests/kernel/fifo/fifo_api/src/test_fifo_cancel.c
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c b/tests/kernel/fifo/fifo_api/src/test_fifo_contexts.c
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/test_fifo_contexts.c
rename to tests/kernel/fifo/fifo_api/src/test_fifo_contexts.c
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo_fail.c b/tests/kernel/fifo/fifo_api/src/test_fifo_fail.c
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/test_fifo_fail.c
rename to tests/kernel/fifo/fifo_api/src/test_fifo_fail.c
diff --git a/tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c b/tests/kernel/fifo/fifo_api/src/test_fifo_loop.c
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/src/test_fifo_loop.c
rename to tests/kernel/fifo/fifo_api/src/test_fifo_loop.c
diff --git a/tests/kernel/fifo/test_fifo_api/testcase.ini b/tests/kernel/fifo/fifo_api/testcase.ini
similarity index 100%
rename from tests/kernel/fifo/test_fifo_api/testcase.ini
rename to tests/kernel/fifo/fifo_api/testcase.ini