diff --git a/tests/fs/fat_fs_api/Makefile b/tests/subsys/fs/fat_fs_api/Makefile
similarity index 100%
rename from tests/fs/fat_fs_api/Makefile
rename to tests/subsys/fs/fat_fs_api/Makefile
diff --git a/tests/fs/fat_fs_api/README.txt b/tests/subsys/fs/fat_fs_api/README.txt
similarity index 100%
rename from tests/fs/fat_fs_api/README.txt
rename to tests/subsys/fs/fat_fs_api/README.txt
diff --git a/tests/fs/fat_fs_api/prj.conf b/tests/subsys/fs/fat_fs_api/prj.conf
similarity index 100%
rename from tests/fs/fat_fs_api/prj.conf
rename to tests/subsys/fs/fat_fs_api/prj.conf
diff --git a/tests/fs/fat_fs_api/src/Makefile b/tests/subsys/fs/fat_fs_api/src/Makefile
similarity index 100%
rename from tests/fs/fat_fs_api/src/Makefile
rename to tests/subsys/fs/fat_fs_api/src/Makefile
diff --git a/tests/fs/fat_fs_api/src/common.c b/tests/subsys/fs/fat_fs_api/src/common.c
similarity index 100%
rename from tests/fs/fat_fs_api/src/common.c
rename to tests/subsys/fs/fat_fs_api/src/common.c
diff --git a/tests/fs/fat_fs_api/src/main.c b/tests/subsys/fs/fat_fs_api/src/main.c
similarity index 100%
rename from tests/fs/fat_fs_api/src/main.c
rename to tests/subsys/fs/fat_fs_api/src/main.c
diff --git a/tests/fs/fat_fs_api/src/test_fat.h b/tests/subsys/fs/fat_fs_api/src/test_fat.h
similarity index 100%
rename from tests/fs/fat_fs_api/src/test_fat.h
rename to tests/subsys/fs/fat_fs_api/src/test_fat.h
diff --git a/tests/fs/fat_fs_api/src/test_fat_dir.c b/tests/subsys/fs/fat_fs_api/src/test_fat_dir.c
similarity index 100%
rename from tests/fs/fat_fs_api/src/test_fat_dir.c
rename to tests/subsys/fs/fat_fs_api/src/test_fat_dir.c
diff --git a/tests/fs/fat_fs_api/src/test_fat_file.c b/tests/subsys/fs/fat_fs_api/src/test_fat_file.c
similarity index 100%
rename from tests/fs/fat_fs_api/src/test_fat_file.c
rename to tests/subsys/fs/fat_fs_api/src/test_fat_file.c
diff --git a/tests/fs/fat_fs_api/src/test_fat_fs.c b/tests/subsys/fs/fat_fs_api/src/test_fat_fs.c
similarity index 100%
rename from tests/fs/fat_fs_api/src/test_fat_fs.c
rename to tests/subsys/fs/fat_fs_api/src/test_fat_fs.c
diff --git a/tests/fs/fat_fs_api/testcase.ini b/tests/subsys/fs/fat_fs_api/testcase.ini
similarity index 100%
rename from tests/fs/fat_fs_api/testcase.ini
rename to tests/subsys/fs/fat_fs_api/testcase.ini