diff --git a/tools/libraries.py b/tools/libraries.py
index 918356ddfb..092dfd120e 100644
--- a/tools/libraries.py
+++ b/tools/libraries.py
@@ -16,8 +16,8 @@ limitations under the License.
 """
 from tools.paths import MBED_RTX, RTOS, RTOS_LIBRARIES, MBED_LIBRARIES,\
     MBED_RPC, RPC_LIBRARY, USB, USB_LIBRARIES, USB_HOST,\
-    USB_HOST_LIBRARIES, FAT_FS, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
-    SD_FS, FS_LIBRARY, ETH_SOURCES, LWIP_SOURCES, ETH_LIBRARY, UBLOX_SOURCES,\
+    USB_HOST_LIBRARIES, DSP_ABSTRACTION, DSP_CMSIS, DSP_LIBRARIES,\
+    ETH_SOURCES, LWIP_SOURCES, ETH_LIBRARY, UBLOX_SOURCES,\
     UBLOX_LIBRARY, CELLULAR_SOURCES, CELLULAR_USB_SOURCES, CPPUTEST_SRC,\
     CPPUTEST_PLATFORM_SRC, CPPUTEST_TESTRUNNER_SCR, CPPUTEST_LIBRARY,\
     CPPUTEST_INC, CPPUTEST_PLATFORM_INC, CPPUTEST_TESTRUNNER_INC,\
@@ -62,7 +62,7 @@ LIBRARIES = [
         "id": "usb_host",
         "source_dir": USB_HOST,
         "build_dir": USB_HOST_LIBRARIES,
-        "dependencies": [MBED_LIBRARIES, FAT_FS, MBED_RTX, RTOS_LIBRARIES],
+        "dependencies": [MBED_LIBRARIES, MBED_RTX, RTOS_LIBRARIES],
     },
 
     # DSP libraries
@@ -73,14 +73,6 @@ LIBRARIES = [
         "dependencies": [MBED_LIBRARIES]
     },
 
-    # File system libraries
-    {
-        "id": "fat",
-        "source_dir": [FAT_FS, SD_FS],
-        "build_dir": FS_LIBRARY,
-        "dependencies": [MBED_LIBRARIES]
-    },
-
     # Network libraries
     {
         "id": "eth",
diff --git a/tools/tests.py b/tools/tests.py
index d61118e50c..2c077e5141 100644
--- a/tools/tests.py
+++ b/tools/tests.py
@@ -988,7 +988,7 @@ TESTS = [
     {
         "id": "USB_10", "description": "MSD",
         "source_dir": join(TEST_DIR, "usb", "host", "mass_storage"),
-        "dependencies": [MBED_LIBRARIES,  USB_HOST_LIBRARIES, FAT_FS, RTOS],
+        "dependencies": [MBED_LIBRARIES,  USB_HOST_LIBRARIES, RTOS],
     },
     {
         "id": "USB_11", "description": "mouse",