diff --git a/tools/test/config_test/test21/mbed_app.json b/tools/test/config_test/test21/mbed_app.json
index d1a874a23d..3c809f7d65 100644
--- a/tools/test/config_test/test21/mbed_app.json
+++ b/tools/test/config_test/test21/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4", "IPV6"]
+            "target.features": ["IPV4"]
         }
     }
 }
diff --git a/tools/test/config_test/test21/test_data.py b/tools/test/config_test/test21/test_data.py
index ca0a48907c..4f7ae443e9 100644
--- a/tools/test/config_test/test21/test_data.py
+++ b/tools/test/config_test/test21/test_data.py
@@ -3,6 +3,6 @@
 expected_results = {
     "test_target": {
         "desc": "test basic features",
-        "expected_features": ["IPV4", "IPV6"]
+        "expected_features": ["IPV4"]
     }
 }
diff --git a/tools/test/config_test/test22/mbed_app.json b/tools/test/config_test/test22/mbed_app.json
index a070a2d556..9509bfecb9 100644
--- a/tools/test/config_test/test22/mbed_app.json
+++ b/tools/test/config_test/test22/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test22/test_data.py b/tools/test/config_test/test22/test_data.py
index 7610f4107c..5edfe17891 100644
--- a/tools/test/config_test/test22/test_data.py
+++ b/tools/test/config_test/test22/test_data.py
@@ -3,6 +3,6 @@
 expected_results = {
     "test_target": {
         "desc": "test composing features",
-        "expected_features": ["IPV4", "IPV6"]
+        "expected_features": ["IPV4", "STORAGE"]
     }
 }
diff --git a/tools/test/config_test/test23/mbed_app.json b/tools/test/config_test/test23/mbed_app.json
index a070a2d556..9509bfecb9 100644
--- a/tools/test/config_test/test23/mbed_app.json
+++ b/tools/test/config_test/test23/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json
index 539d8ccc22..4ba03096c9 100644
--- a/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json
+++ b/tools/test/config_test/test24/FEATURE_IPV4/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json b/tools/test/config_test/test24/FEATURE_STORAGE/lib2/mbed_lib.json
similarity index 100%
rename from tools/test/config_test/test24/FEATURE_IPV6/lib2/mbed_lib.json
rename to tools/test/config_test/test24/FEATURE_STORAGE/lib2/mbed_lib.json
diff --git a/tools/test/config_test/test24/test_data.py b/tools/test/config_test/test24/test_data.py
index 00681ed475..a77f026758 100644
--- a/tools/test/config_test/test24/test_data.py
+++ b/tools/test/config_test/test24/test_data.py
@@ -3,6 +3,6 @@
 expected_results = {
     "test_target": {
         "desc": "test recursive features",
-        "expected_features": ["IPV4", "IPV6", "UVISOR"]
+        "expected_features": ["IPV4", "STORAGE", "UVISOR"]
     }
 }
diff --git a/tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json
similarity index 63%
rename from tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json
rename to tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json
index 539d8ccc22..4ba03096c9 100644
--- a/tools/test/config_test/test25/FEATURE_IPV6/FEATURE_IPV4/lib1/mbed_lib.json
+++ b/tools/test/config_test/test25/FEATURE_STORAGE/FEATURE_IPV4/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json b/tools/test/config_test/test25/FEATURE_STORAGE/lib2/mbed_lib.json
similarity index 100%
rename from tools/test/config_test/test25/FEATURE_IPV6/lib2/mbed_lib.json
rename to tools/test/config_test/test25/FEATURE_STORAGE/lib2/mbed_lib.json
diff --git a/tools/test/config_test/test25/mbed_app.json b/tools/test/config_test/test25/mbed_app.json
index d1a874a23d..b4ad5832fb 100644
--- a/tools/test/config_test/test25/mbed_app.json
+++ b/tools/test/config_test/test25/mbed_app.json
@@ -1,7 +1,7 @@
 {
     "target_overrides": {
         "*": {
-            "target.features": ["IPV4", "IPV6"]
+            "target.features": ["IPV4", "STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json b/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json
index 539d8ccc22..4ba03096c9 100644
--- a/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json
+++ b/tools/test/config_test/test26/FEATURE_IPV4/lib1/mbed_lib.json
@@ -2,7 +2,7 @@
     "name": "lib1",
     "target_overrides": {
         "*": {
-            "target.features_add": ["IPV6"]
+            "target.features_add": ["STORAGE"]
         }
     }
 }
diff --git a/tools/test/config_test/test26/FEATURE_IPV6/lib2/mbed_lib.json b/tools/test/config_test/test26/FEATURE_STORAGE/lib2/mbed_lib.json
similarity index 100%
rename from tools/test/config_test/test26/FEATURE_IPV6/lib2/mbed_lib.json
rename to tools/test/config_test/test26/FEATURE_STORAGE/lib2/mbed_lib.json