diff --git a/features/filesystem/littlefs/TESTS_COMMON/ExhaustibleBlockDevice.cpp b/features/filesystem/bd/ExhaustibleBlockDevice.cpp
similarity index 100%
rename from features/filesystem/littlefs/TESTS_COMMON/ExhaustibleBlockDevice.cpp
rename to features/filesystem/bd/ExhaustibleBlockDevice.cpp
diff --git a/features/filesystem/littlefs/TESTS_COMMON/ExhaustibleBlockDevice.h b/features/filesystem/bd/ExhaustibleBlockDevice.h
similarity index 100%
rename from features/filesystem/littlefs/TESTS_COMMON/ExhaustibleBlockDevice.h
rename to features/filesystem/bd/ExhaustibleBlockDevice.h
diff --git a/features/filesystem/littlefs/TESTS_COMMON/ObservingBlockDevice.cpp b/features/filesystem/bd/ObservingBlockDevice.cpp
similarity index 100%
rename from features/filesystem/littlefs/TESTS_COMMON/ObservingBlockDevice.cpp
rename to features/filesystem/bd/ObservingBlockDevice.cpp
diff --git a/features/filesystem/littlefs/TESTS_COMMON/ObservingBlockDevice.h b/features/filesystem/bd/ObservingBlockDevice.h
similarity index 100%
rename from features/filesystem/littlefs/TESTS_COMMON/ObservingBlockDevice.h
rename to features/filesystem/bd/ObservingBlockDevice.h
diff --git a/features/filesystem/littlefs/TESTS_COMMON/ReadOnlyBlockDevice.cpp b/features/filesystem/bd/ReadOnlyBlockDevice.cpp
similarity index 100%
rename from features/filesystem/littlefs/TESTS_COMMON/ReadOnlyBlockDevice.cpp
rename to features/filesystem/bd/ReadOnlyBlockDevice.cpp
diff --git a/features/filesystem/littlefs/TESTS_COMMON/ReadOnlyBlockDevice.h b/features/filesystem/bd/ReadOnlyBlockDevice.h
similarity index 100%
rename from features/filesystem/littlefs/TESTS_COMMON/ReadOnlyBlockDevice.h
rename to features/filesystem/bd/ReadOnlyBlockDevice.h