diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_debug.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/COMMON/fslittle_debug.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_debug.h
rename to components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/COMMON/fslittle_debug.h
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_test.c b/components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/COMMON/fslittle_test.c
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_test.c
rename to components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/COMMON/fslittle_test.c
diff --git a/components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_test.h b/components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/COMMON/fslittle_test.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_FLASHIAP/util/fslittle_test.h
rename to components/storage/blockdevice/COMPONENT_FLASHIAP/TESTS/COMMON/fslittle_test.h
diff --git a/components/storage/blockdevice/COMPONENT_SD/util/fsfat_debug.h b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/util/fsfat_debug.h
rename to components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_debug.h
diff --git a/components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.c b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.c
rename to components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.c
diff --git a/components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.h b/components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/util/fsfat_test.h
rename to components/storage/blockdevice/COMPONENT_SD/TESTS/COMMON/fsfat_test.h
diff --git a/components/storage/blockdevice/COMPONENT_SD/config/mbed_lib.json b/components/storage/blockdevice/COMPONENT_SD/mbed_lib.json
similarity index 100%
rename from components/storage/blockdevice/COMPONENT_SD/config/mbed_lib.json
rename to components/storage/blockdevice/COMPONENT_SD/mbed_lib.json