diff --git a/tools/test_configs/ESP8266Interface.json b/tools/test_configs/ESP8266Interface.json
index 6881265116..d313479814 100644
--- a/tools/test_configs/ESP8266Interface.json
+++ b/tools/test_configs/ESP8266Interface.json
@@ -1,16 +1,5 @@
 {
     "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"ESP8266Interface.h\""
-        },
-        "object-construction" : {
-            "value" : "new ESP8266Interface( D1, D0, false )"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
-            "value" : "((ESP8266Interface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
-        },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
             "value" : "\"echo.mbedcloudtesting.com\""
@@ -18,20 +7,15 @@
         "echo-server-port" : {
             "help" : "Port of echo server",
             "value" : "7"
-        },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
-        "tcp-client-echo-buffer-size" : {
-            "help" : "Number of bytes to be send to echo server",
-            "value" : "200"
-        },
-        "ESP8266-TX": {
-            "value":"D1"
-        },
-        "ESP8266-RX": {
-            "value":"D0"
+        }
+    },
+    "target_overrides": {
+        "*": {
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
+            "nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
+            "nsapi.default-wifi-security": "WIFI_SECURITY",
+            "esp8266.provide-default": true
         }
     }
 }
diff --git a/tools/test_configs/EthernetInterface.json b/tools/test_configs/EthernetInterface.json
index fc8a4b8215..70253a2e9f 100644
--- a/tools/test_configs/EthernetInterface.json
+++ b/tools/test_configs/EthernetInterface.json
@@ -1,16 +1,5 @@
 {
     "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"EthernetInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new EthernetInterface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name",
-            "value" : "net->connect()"
-        },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
             "value" : "\"echo.mbedcloudtesting.com\""
@@ -18,16 +7,11 @@
         "echo-server-port" : {
             "help" : "Port of echo server",
             "value" : "7"
-        },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
         }
     },
     "target_overrides": {
         "*": {
-            "target.features_add": ["LWIP"],
-            "nsapi.default-stack": "LWIP"
+            "target.network-default-interface-type": "ETHERNET"
         }
     }
 }
diff --git a/tools/test_configs/HeapBlockDeviceAndEthernetInterface.json b/tools/test_configs/HeapBlockDeviceAndEthernetInterface.json
index 2c69e88974..0969f7537a 100644
--- a/tools/test_configs/HeapBlockDeviceAndEthernetInterface.json
+++ b/tools/test_configs/HeapBlockDeviceAndEthernetInterface.json
@@ -1,16 +1,5 @@
 {
     "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"EthernetInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new EthernetInterface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name",
-            "value" : "net->connect()"
-        },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
             "value" : "\"echo.mbedcloudtesting.com\""
@@ -19,10 +8,6 @@
             "help" : "Port of echo server",
             "value" : "7"
         },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
         "sim-blockdevice": {
             "help": "Simulated block device, requires sufficient heap",
             "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
@@ -31,8 +16,7 @@
     },
     "target_overrides": {
         "*": {
-            "target.features_add": ["LWIP"],
-            "nsapi.default-stack": "LWIP"
+            "target.network-default-interface-type": "ETHERNET"
         }
     }
 }
diff --git a/tools/test_configs/HeapBlockDeviceAndWifiInterface.json b/tools/test_configs/HeapBlockDeviceAndWifiInterface.json
new file mode 100644
index 0000000000..b4d1f6f336
--- /dev/null
+++ b/tools/test_configs/HeapBlockDeviceAndWifiInterface.json
@@ -0,0 +1,25 @@
+{
+    "config": {
+        "echo-server-addr" : {
+            "help" : "IP address of echo server",
+            "value" : "\"echo.mbedcloudtesting.com\""
+        },
+        "echo-server-port" : {
+            "help" : "Port of echo server",
+            "value" : "7"
+        },
+        "sim-blockdevice": {
+            "help": "Simulated block device, requires sufficient heap",
+            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
+            "value": "HeapBlockDevice"
+        }
+    },
+    "target_overrides": {
+        "*": {
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
+            "nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
+            "nsapi.default-wifi-security": "WIFI_SECURITY"
+        }
+    }
+}
diff --git a/tools/test_configs/ISM43362Interface.json b/tools/test_configs/ISM43362Interface.json
index 170bf91df1..defb21eb98 100644
--- a/tools/test_configs/ISM43362Interface.json
+++ b/tools/test_configs/ISM43362Interface.json
@@ -1,16 +1,5 @@
 {
     "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"ISM43362Interface.h\""
-        },
-        "object-construction" : {
-            "value" : "new ISM43362Interface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name",
-            "value" : "net->wifiInterface()->connect(MBED_CONF_APP_WIFI_SECURE_SSID, MBED_CONF_APP_WIFI_PASSWORD, NSAPI_SECURITY_WPA_WPA2)"
-        },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
             "value" : "\"echo.mbedcloudtesting.com\""
@@ -19,14 +8,6 @@
             "help" : "Port of echo server",
             "value" : "7"
         },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
-        "tcp-client-echo-buffer-size" : {
-            "help" : "Number of bytes to be send to echo server",
-            "value" : "200"
-        },
         "wifi-secure-ssid": {
             "help": "WiFi SSID for WPA2 secured network",
             "value": "\"SSID-SECURE\""
@@ -66,7 +47,12 @@
     },
     "target_overrides": {
         "*": {
-            "platform.stdio-convert-newlines": true
+            "platform.stdio-convert-newlines": true,
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
+            "nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
+            "nsapi.default-wifi-security": "WIFI_SECURITY",
+            "ism43362.provide-default": true
         }
     }
 }
diff --git a/tools/test_configs/OdinInterface.json b/tools/test_configs/OdinInterface.json
deleted file mode 100644
index 24dfe9b054..0000000000
--- a/tools/test_configs/OdinInterface.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"OdinWiFiInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new OdinWiFiInterface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name",
-            "value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD)"
-        },
-        "echo-server-addr" : {
-            "help" : "IP address of echo server",
-            "value" : "\"echo.mbedcloudtesting.com\""
-        },
-        "echo-server-port" : {
-            "help" : "Port of echo server",
-            "value" : "7"
-        },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
-        "sim-blockdevice": {
-            "help": "Simulated block device, requires sufficient heap",
-            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
-            "value": "HeapBlockDevice"
-        }
-    },
-    "target_overrides": {
-        "*": {
-            "target.features_add": ["LWIP"],
-            "nsapi.default-stack": "LWIP"
-        }
-    }
-}
diff --git a/tools/test_configs/Odin_EthernetInterface.json b/tools/test_configs/Odin_EthernetInterface.json
deleted file mode 100644
index 2c69e88974..0000000000
--- a/tools/test_configs/Odin_EthernetInterface.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"EthernetInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new EthernetInterface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name",
-            "value" : "net->connect()"
-        },
-        "echo-server-addr" : {
-            "help" : "IP address of echo server",
-            "value" : "\"echo.mbedcloudtesting.com\""
-        },
-        "echo-server-port" : {
-            "help" : "Port of echo server",
-            "value" : "7"
-        },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
-        "sim-blockdevice": {
-            "help": "Simulated block device, requires sufficient heap",
-            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
-            "value": "HeapBlockDevice"
-        }
-    },
-    "target_overrides": {
-        "*": {
-            "target.features_add": ["LWIP"],
-            "nsapi.default-stack": "LWIP"
-        }
-    }
-}
diff --git a/tools/test_configs/RealtekInterface.json b/tools/test_configs/RealtekInterface.json
deleted file mode 100644
index 36afe16cc5..0000000000
--- a/tools/test_configs/RealtekInterface.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"RTWInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new RTWInterface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL with your WiFi settings",
-            "value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY, WIFI_CHANNEL)"
-        },
-        "echo-server-addr" : {
-            "help" : "IP address of echo server",
-            "value" : "\"echo.mbedcloudtesting.com\""
-        },
-        "echo-server-port" : {
-            "help" : "Port of echo server",
-            "value" : "7"
-        },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
-        "sim-blockdevice": {
-            "help": "Simulated block device, requires sufficient heap",
-            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
-            "value": "HeapBlockDevice"
-        }
-    },
-    "target_overrides": {
-        "*": {
-            "target.features_add": ["LWIP"],
-            "nsapi.default-stack": "LWIP"
-        }
-    }
-}
diff --git a/tools/test_configs/SpwfSAInterface.json b/tools/test_configs/SpwfSAInterface.json
index e1f3c6c5a6..776abcc901 100644
--- a/tools/test_configs/SpwfSAInterface.json
+++ b/tools/test_configs/SpwfSAInterface.json
@@ -1,16 +1,5 @@
 {
     "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"SpwfSAInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new SpwfSAInterface( D8, D2 )"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
-            "value" : "((SpwfSAInterface *)net)->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
-        },
         "echo-server-addr" : {
             "help" : "IP address of echo server",
             "value" : "\"echo.mbedcloudtesting.com\""
@@ -19,9 +8,22 @@
             "help" : "Port of echo server",
             "value" : "7"
         },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
+        "WIFI-TX" : {
+            "help" : "Wifi TX pin",
+            "value" : "D8"
+        },
+        "WIFI-RX" : {
+            "help" : "Wifi RX pin",
+            "value" : "D2"
+        }
+    },
+    "target_overrides": {
+        "*": {
+            "target.network-default-interface-type": "WIFI",
+            "nsapi.default-wifi-ssid": "\"WIFI_SSID\"",
+            "nsapi.default-wifi-password": "\"WIFI_PASSWORD\"",
+            "nsapi.default-wifi-security": "WIFI_SECURITY",
+            "idw0xx1.provide-default": true
         }
     }
 }
diff --git a/tools/test_configs/WicedInterface.json b/tools/test_configs/WicedInterface.json
deleted file mode 100644
index 51f0076f24..0000000000
--- a/tools/test_configs/WicedInterface.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "config": {
-        "header-file": {
-            "help" : "String for including your driver header file",
-            "value" : "\"WicedInterface.h\""
-        },
-        "object-construction" : {
-            "value" : "new WicedInterface()"
-        },
-        "connect-statement" : {
-            "help" : "Must use 'net' variable name, replace WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY with your WiFi settings",
-            "value" : "net->wifiInterface()->connect(WIFI_SSID, WIFI_PASSWORD, WIFI_SECURITY)"
-        },
-        "echo-server-addr" : {
-            "help" : "IP address of echo server",
-            "value" : "\"echo.mbedcloudtesting.com\""
-        },
-        "echo-server-port" : {
-            "help" : "Port of echo server",
-            "value" : "7"
-        },
-        "tcp-echo-prefix" : {
-            "help" : "Some servers send a prefix before echoed message",
-            "value" : null
-        },
-        "sim-blockdevice": {
-            "help": "Simulated block device, requires sufficient heap",
-            "macro_name": "MBED_TEST_SIM_BLOCKDEVICE",
-            "value": "HeapBlockDevice"
-        }
-    },
-    "target_overrides": {
-        "*": {
-            "nsapi.default-stack": "LWIP"
-        },
-        "MTB_ADV_WISE_1530": {
-            "target.extra_labels_add": ["WICED"],
-            "target.features_add": ["BLE", "LWIP"]
-        },
-        "MTB_USI_WM_BN_BM_22": {
-            "target.extra_labels_add": ["WICED"],
-            "target.features_add": ["BLE", "LWIP"]
-        },
-        "MTB_MXCHIP_EMW3166": {
-            "target.extra_labels_add": ["WICED"],
-            "target.features_add": ["LWIP"]
-        }
-    }
-}
diff --git a/tools/test_configs/config_paths.json b/tools/test_configs/config_paths.json
index a8cf4250ce..c9b912d1bf 100644
--- a/tools/test_configs/config_paths.json
+++ b/tools/test_configs/config_paths.json
@@ -2,11 +2,8 @@
     "ETHERNET" : "EthernetInterface.json",
     "HEAPBLOCKDEVICE": "HeapBlockDevice.json",
     "HEAPBLOCKDEVICE_AND_ETHERNET": "HeapBlockDeviceAndEthernetInterface.json",
-    "ODIN_WIFI" : "OdinInterface.json",
-    "ODIN_ETHERNET" : "Odin_EthernetInterface.json",
-    "REALTEK_WIFI" : "RealtekInterface.json",	
+    "HEAPBLOCKDEVICE_AND_WIFI": "HeapBlockDeviceAndWifiInterface.json",
     "ESP8266_WIFI" : "ESP8266Interface.json",
-    "WICED_WIFI" : "WicedInterface.json",
     "ISM43362_WIFI" : "ISM43362Interface.json",
     "IDW0XX1_WIFI" : "SpwfSAInterface.json"
 }
diff --git a/tools/test_configs/target_configs.json b/tools/test_configs/target_configs.json
index 5deaacb7b6..85af0aebac 100644
--- a/tools/test_configs/target_configs.json
+++ b/tools/test_configs/target_configs.json
@@ -1,11 +1,11 @@
 {
     "UBLOX_EVK_ODIN_W2": {
         "default_test_configuration": "NONE",
-        "test_configurations": ["ODIN_WIFI", "ODIN_ETHERNET"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI", "HEAPBLOCKDEVICE_AND_ETHERNET"]
     },
     "REALTEK_RTL8195AM": {
         "default_test_configuration": "NONE",
-        "test_configurations": ["REALTEK_WIFI"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
     },
     "K64F": {
         "default_test_configuration": "HEAPBLOCKDEVICE_AND_ETHERNET",
@@ -25,19 +25,19 @@
     },
     "MTB_UBLOX_ODIN_W2": {
         "default_test_configuration": "NONE",
-        "test_configurations": ["ODIN_WIFI"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
     },
     "MTB_ADV_WISE_1530": {
         "default_test_configuration": "NONE",
-        "test_configurations": ["WICED_WIFI"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
     },
     "MTB_USI_WM_BN_BM_22": {
         "default_test_configuration": "NONE",
-        "test_configurations": ["WICED_WIFI"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
     },
     "MTB_MXCHIP_EMW3166": {
         "default_test_configuration": "NONE",
-        "test_configurations": ["WICED_WIFI"]
+        "test_configurations": ["HEAPBLOCKDEVICE_AND_WIFI"]
     },
     "NUCLEO_F401RE": {
         "default_test_configuration": "NONE",