diff --git a/tools/test/examples/cloud_examples.json b/tools/test/examples/cloud_examples.json
new file mode 100644
index 0000000000..8ace07fdb3
--- /dev/null
+++ b/tools/test/examples/cloud_examples.json
@@ -0,0 +1,52 @@
+{
+  "examples": [
+    {
+      "name": "mbed-os-example-for-aws",
+      "github": "https://github.com/ARMmbed/mbed-os-example-for-aws",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : ["DISCO_L475VG_IOT01A", "K64F", "NUCLEO_F429ZI"],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "baud_rate": 115200,
+      "compare_log": ["mbed-os-example-for-aws/tests/aws.log"],
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-for-azure",
+      "github": "https://github.com/ARMmbed/mbed-os-example-for-azure",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : ["DISCO_L475VG_IOT01A", "K64F", "NUCLEO_F429ZI"],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "baud_rate": 115200,
+      "compare_log": ["mbed-os-example-for-azure/tests/azure.log"],
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-for-google-iot-cloud",
+      "github": "https://github.com/ARMmbed/mbed-os-example-for-google-iot-cloud",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : ["DISCO_L475VG_IOT01A", "K64F", "NUCLEO_F429ZI"],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "baud_rate": 115200,
+      "compare_log": ["mbed-os-example-for-google-iot-cloud/tests/google-iot-cloud.log"],
+      "auto-update" : true
+    }
+  ]
+}
diff --git a/tools/test/examples/examples.json b/tools/test/examples/examples.json
index 4341e42ff7..8e7dd24ca8 100644
--- a/tools/test/examples/examples.json
+++ b/tools/test/examples/examples.json
@@ -466,51 +466,6 @@
         "baud_rate": 9600,
         "compare_log": ["mbed-os-example-atecc608a/tests/atecc608a.log"],
         "auto-update" : true
-    },
-    {
-      "name": "mbed-os-example-for-aws",
-      "github": "https://github.com/ARMmbed/mbed-os-example-for-aws",
-      "sub-repo-example": false,
-      "subs": [],
-      "features" : [],
-      "targets" : ["DISCO_L475VG_IOT01A", "K64F", "NUCLEO_F429ZI"],
-      "toolchains" : [],
-      "exporters": [],
-      "compile" : true,
-      "export": true,
-      "test" : false,
-      "baud_rate": 115200,
-      "auto-update" : true
-    },
-    {
-      "name": "mbed-os-example-for-azure",
-      "github": "https://github.com/ARMmbed/mbed-os-example-for-azure",
-      "sub-repo-example": false,
-      "subs": [],
-      "features" : [],
-      "targets" : ["DISCO_L475VG_IOT01A", "K64F", "NUCLEO_F429ZI"],
-      "toolchains" : [],
-      "exporters": [],
-      "compile" : true,
-      "export": true,
-      "test" : false,
-      "baud_rate": 115200,
-      "auto-update" : true
-    },
-    {
-      "name": "mbed-os-example-for-google-iot-cloud",
-      "github": "https://github.com/ARMmbed/mbed-os-example-for-google-iot-cloud",
-      "sub-repo-example": false,
-      "subs": [],
-      "features" : [],
-      "targets" : ["DISCO_L475VG_IOT01A", "K64F", "NUCLEO_F429ZI"],
-      "toolchains" : [],
-      "exporters": [],
-      "compile" : true,
-      "export": true,
-      "test" : false,
-      "baud_rate": 115200,
-      "auto-update" : true
     }
   ]
 }