diff --git a/libraries/tests/mbed/i2c_eeprom/main.cpp b/libraries/tests/mbed/i2c_eeprom/main.cpp
index 16ba2e1350..68d5aeec84 100644
--- a/libraries/tests/mbed/i2c_eeprom/main.cpp
+++ b/libraries/tests/mbed/i2c_eeprom/main.cpp
@@ -27,6 +27,9 @@ I2C i2c(PTC9, PTC8);
 #elif defined(TARGET_KL46Z)
 I2C i2c(PTC9, PTC8);
 
+#elif defined(TARGET_K64F)
+I2C i2c(PTE25, PTE24);
+
 #elif defined(TARGET_K20D50M)
 I2C i2c(PTB3, PTB2);
 
@@ -47,9 +50,6 @@ I2C i2c(P0_23, P0_22);
     defined(TARGET_NUCLEO_L053R8)
 I2C i2c(I2C_SDA, I2C_SCL);
 
-#elif defined(TARGET_K64F)
-I2C i2c(PTE25, PTE24);
-
 #elif defined(TARGET_LPC11U68)
 I2C i2c(SDA, SCL);
 
diff --git a/libraries/tests/mbed/i2c_eeprom_line/main.cpp b/libraries/tests/mbed/i2c_eeprom_line/main.cpp
index b32d7a3334..ddad2dab6a 100644
--- a/libraries/tests/mbed/i2c_eeprom_line/main.cpp
+++ b/libraries/tests/mbed/i2c_eeprom_line/main.cpp
@@ -37,6 +37,9 @@ I2C i2c(PTC9, PTC8);
 #elif defined(TARGET_KL46Z)
 I2C i2c(PTC9, PTC8);
 
+#elif defined(TARGET_K64F)
+I2C i2c(PTE25, PTE24);
+
 #elif defined(TARGET_K20D50M)
 I2C i2c(PTB3, PTB2);
 
@@ -60,9 +63,6 @@ I2C i2c(SDA, SCL);
     defined(TARGET_NUCLEO_L053R8)
 I2C i2c(I2C_SDA, I2C_SCL);
 
-#elif defined(TARGET_K64F)
-I2C i2c(PTE25, PTE24);
-
 #else
 I2C i2c(p28, p27);
 #endif
diff --git a/libraries/tests/mbed/sd/main.cpp b/libraries/tests/mbed/sd/main.cpp
index c7660bf783..062c4e9b7e 100644
--- a/libraries/tests/mbed/sd/main.cpp
+++ b/libraries/tests/mbed/sd/main.cpp
@@ -8,6 +8,9 @@ SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
 #elif defined(TARGET_KL46Z)
 SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
 
+#elif defined(TARGET_K64F)
+SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
+
 #elif defined(TARGET_K20D50M)
 SDFileSystem sd(PTD2, PTD3, PTD1, PTC2, "sd");
 
diff --git a/libraries/tests/rtos/mbed/file/main.cpp b/libraries/tests/rtos/mbed/file/main.cpp
index 017040dfdb..0d603ceea3 100644
--- a/libraries/tests/rtos/mbed/file/main.cpp
+++ b/libraries/tests/rtos/mbed/file/main.cpp
@@ -17,6 +17,9 @@ void sd_thread(void const *argument)
 #elif defined(TARGET_KL46Z)
     SDFileSystem sd(PTD6, PTD7, PTD5, PTD4, "sd");
 
+#elif defined(TARGET_K64F)
+    SDFileSystem sd(PTD2, PTD3, PTD1, PTD0, "sd");
+
 #else
     SDFileSystem sd(p11, p12, p13, p14, "sd");
 #endif