diff --git a/tests/filesystem/fat_fs/Makefile b/tests/fs/fat_fs/Makefile
similarity index 100%
rename from tests/filesystem/fat_fs/Makefile
rename to tests/fs/fat_fs/Makefile
diff --git a/tests/filesystem/fat_fs/README.txt b/tests/fs/fat_fs/README.txt
similarity index 100%
rename from tests/filesystem/fat_fs/README.txt
rename to tests/fs/fat_fs/README.txt
diff --git a/tests/filesystem/fat_fs/prj.conf b/tests/fs/fat_fs/prj.conf
similarity index 100%
rename from tests/filesystem/fat_fs/prj.conf
rename to tests/fs/fat_fs/prj.conf
diff --git a/tests/filesystem/fat_fs/src/Makefile b/tests/fs/fat_fs/src/Makefile
similarity index 100%
rename from tests/filesystem/fat_fs/src/Makefile
rename to tests/fs/fat_fs/src/Makefile
diff --git a/tests/filesystem/fat_fs/src/main.c b/tests/fs/fat_fs/src/main.c
similarity index 100%
rename from tests/filesystem/fat_fs/src/main.c
rename to tests/fs/fat_fs/src/main.c
diff --git a/tests/filesystem/fat_fs/testcase.ini b/tests/fs/fat_fs/testcase.ini
similarity index 100%
rename from tests/filesystem/fat_fs/testcase.ini
rename to tests/fs/fat_fs/testcase.ini