diff --git a/tools/test/examples/cloud_examples_cmake.json b/tools/test/examples/cloud_examples_cmake.json
index 09548c7560..8ace07fdb3 100644
--- a/tools/test/examples/cloud_examples_cmake.json
+++ b/tools/test/examples/cloud_examples_cmake.json
@@ -15,6 +15,38 @@
       "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_cmake.json b/tools/test/examples/examples_cmake.json
index ffa0d1a001..b04efba0b6 100644
--- a/tools/test/examples/examples_cmake.json
+++ b/tools/test/examples/examples_cmake.json
@@ -1,237 +1,389 @@
 {
-    "examples": [
-      {
-        "name": "mbed-os-example-blinky",
-        "github": "https://github.com/ARMmbed/mbed-os-example-blinky",
+  "examples": [
+    {
+      "name": "mbed-os-example-blinky",
+      "github": "https://github.com/ARMmbed/mbed-os-example-blinky",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : [],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "baud_rate": 9600,
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-blinky-baremetal",
+      "github": "https://github.com/ARMmbed/mbed-os-example-blinky-baremetal",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : ["K66F", "NUCLEO_F429ZI", "ARCH_PRO", "LPC1768"],
+      "toolchains" : [],
+      "exporters": ["iar", "make_armc5", "make_armc6", "make_gcc_arm", "make_iar"],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-tls",
+      "github": "https://github.com/ARMmbed/mbed-os-example-tls",
+      "sub-repo-example": true,
+      "subs": [
+          "benchmark",
+          "tls-client",
+          "hashing",
+          "authcrypt"
+      ],
+      "features" : [],
+      "targets" : ["K66F", "NUCLEO_F429ZI"],
+      "toolchains" : ["GCC_ARM", "ARM"],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : true,
+      "baud_rate": 9600,
+      "compare_log": [
+          "mbed-os-example-tls/tests/benchmark.log",
+          "mbed-os-example-tls/tests/tls-client.log",
+          "mbed-os-example-tls/tests/hashing.log",
+          "mbed-os-example-tls/tests/authcrypt.log"
+      ],
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-ble",
+      "github":"https://github.com/ARMmbed/mbed-os-example-ble",
+      "sub-repo-example": true,
+      "subs": [
+            "BLE_Advertising",
+            "BLE_GAP",
+            "BLE_GattClient_CharacteristicUpdates",
+            "BLE_GattClient_CharacteristicWrite",
+            "BLE_GattServer_AddService",
+            "BLE_GattServer_CharacteristicUpdates",
+            "BLE_GattServer_CharacteristicWrite",
+            "BLE_PeriodicAdvertising",
+            "BLE_SecurityAndPrivacy"
+      ],
+      "features" : [],
+      "targets" : ["NRF52_DK", "DISCO_L475VG_IOT01A"],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-sockets",
+      "github":"https://github.com/ARMmbed/mbed-os-example-sockets",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : ["K66F", "NUCLEO_F429ZI", "NUMAKER_PFM_NUC472", "FVP_MPS2_M3"],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : true,
+      "baud_rate": 9600,
+      "compare_log": ["mbed-os-example-sockets/tests/sockets.log"],
+      "auto-update" : true
+    },
+    {
+      "name": "mbed-os-example-cellular",
+      "github":"https://github.com/ARMmbed/mbed-os-example-cellular",
+      "sub-repo-example": false,
+      "subs": [],
+      "features" : [],
+      "targets" : ["MTS_DRAGONFLY_F411RE"],
+      "toolchains" : [],
+      "exporters": [],
+      "compile" : true,
+      "export": true,
+      "test" : false,
+      "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-lorawan",
+        "github":"https://github.com/ARMmbed/mbed-os-example-lorawan",
         "sub-repo-example": false,
         "subs": [],
         "features" : [],
-        "targets" : [],
+        "targets" : ["MTS_MDOT_F411RE"],
         "toolchains" : [],
         "exporters": [],
         "compile" : true,
-        "export": true,
-        "test" : false,
-        "baud_rate": 9600,
-        "auto-update" : true
-      },
-      {
-        "name": "mbed-os-example-ble",
-        "github":"https://github.com/ARMmbed/mbed-os-example-ble",
-        "sub-repo-example": true,
-        "subs": [
-              "BLE_Advertising",
-              "BLE_GAP",
-              "BLE_GattClient_CharacteristicUpdates",
-              "BLE_GattClient_CharacteristicWrite",
-              "BLE_GattServer_AddService",
-              "BLE_GattServer_CharacteristicUpdates",
-              "BLE_GattServer_CharacteristicWrite",
-              "BLE_PeriodicAdvertising",
-              "BLE_SecurityAndPrivacy"
-        ],
-        "features" : [],
-        "targets" : ["NRF52_DK", "DISCO_L475VG_IOT01A"],
-        "toolchains" : [],
-        "exporters": [],
-        "compile" : true,
-        "export": true,
+        "export": false,
         "test" : false,
         "auto-update" : true
-      },
-      {
-        "name": "mbed-os-example-sockets",
-        "github":"https://github.com/ARMmbed/mbed-os-example-sockets",
+    },
+    {
+        "name": "mbed-os-example-devicekey",
+        "github":"https://github.com/ARMmbed/mbed-os-example-devicekey",
         "sub-repo-example": false,
         "subs": [],
         "features" : [],
-        "targets" : ["K64F", "K66F"],
+        "targets" : ["DISCO_L475VG_IOT01A"],
         "toolchains" : [],
         "exporters": [],
         "compile" : true,
         "export": true,
         "test" : true,
         "baud_rate": 9600,
-        "compare_log": ["mbed-os-example-sockets/tests/sockets.log"],
+        "compare_log": ["mbed-os-example-devicekey/tests/devicekey.log"],
         "auto-update" : true
-      },
-      {
-        "name": "mbed-os-example-cellular",
-        "github":"https://github.com/ARMmbed/mbed-os-example-cellular",
+    },
+    {
+        "name": "mbed-os-example-thread-statistics",
+        "github":"https://github.com/ARMmbed/mbed-os-example-thread-statistics",
         "sub-repo-example": false,
         "subs": [],
         "features" : [],
-        "targets" : ["WIO_3G"],
+        "targets" : ["NUCLEO_F429ZI", "FVP_MPS2_M3"],
         "toolchains" : [],
         "exporters": [],
         "compile" : true,
         "export": true,
-        "test" : false,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-thread-statistics/tests/thread-statistics.log"],
         "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-lorawan",
-          "github":"https://github.com/ARMmbed/mbed-os-example-lorawan",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["K64F"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": false,
-          "test" : false,
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-devicekey",
-          "github":"https://github.com/ARMmbed/mbed-os-example-devicekey",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["K66F"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": ["mbed-os-example-devicekey/tests/devicekey.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-cpu-stats",
-          "github":"https://github.com/ARMmbed/mbed-os-example-cpu-stats",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["K64F", "FVP_MPS2_M3"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": ["mbed-os-example-cpu-stats/tests/cpu-stats.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-mbed-crypto",
-          "github":"https://github.com/ARMmbed/mbed-os-example-mbed-crypto",
-          "sub-repo-example": true,
-          "subs": ["getting-started"],
-          "features" : [],
-          "targets" : ["K64F"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": ["mbed-os-example-mbed-crypto/tests/getting-started.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-psa",
-          "github":"https://github.com/ARMmbed/mbed-os-example-psa",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["ARM_MUSCA_S1", "ARM_MUSCA_B1", "K64F"],
-          "toolchains" : ["GCC_ARM", "ARM"],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 115200,
-          "compare_log": ["mbed-os-example-psa/tests/psa.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-nfc",
-          "github": "https://github.com/ARMmbed/mbed-os-example-nfc",
-          "sub-repo-example": true,
-          "subs": [
-              "NFC_EEPROM",
-              "NFC_SmartPoster"
-          ],
-          "features" : [],
-          "targets" : ["NUCLEO_F401RE"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": [
-              "mbed-os-example-nfc/tests/EEPROM.log",
-              "mbed-os-example-nfc/tests/SmartPoster_noShield.log"
-          ],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-blockdevice",
-          "github":"https://github.com/armmbed/mbed-os-example-blockdevice",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["K64F"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": ["mbed-os-example-blockdevice/tests/blockdevice.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-kvstore",
-          "github":"https://github.com/ARMmbed/mbed-os-example-kvstore",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["K64F", "DISCO_L475VG_IOT01A"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": ["mbed-os-example-kvstore/tests/kvstore.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-crash-reporting",
-          "github":"https://github.com/ARMmbed/mbed-os-example-crash-reporting",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : ["K64F"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 115200,
-          "compare_log": ["mbed-os-example-crash-reporting/tests/crash-reporting.log"],
-          "auto-update" : true
-      },
-      {
-          "name": "mbed-os-example-attestation",
-          "github": "https://github.com/ARMmbed/mbed-os-example-attestation",
-          "sub-repo-example": false,
-          "subs": [],
-          "features" : [],
-          "targets" : [ "K66F", "NUCLEO_F429ZI"],
-          "toolchains" : [],
-          "exporters": [],
-          "compile" : true,
-          "export": true,
-          "test" : true,
-          "baud_rate": 9600,
-          "compare_log": ["mbed-os-example-attestation/tests/attestation.log"],
-          "auto-update" : true
-      }
-    ]
+    },
+    {
+        "name": "mbed-os-example-sys-info",
+        "github":"https://github.com/ARMmbed/mbed-os-example-sys-info",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F", "FVP_MPS2_M3"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-sys-info/tests/sys-info.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-cpu-stats",
+        "github":"https://github.com/ARMmbed/mbed-os-example-cpu-stats",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F", "FVP_MPS2_M3"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-cpu-stats/tests/cpu-stats.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-socket-stats",
+        "github":"https://github.com/ARMmbed/mbed-os-example-socket-stats",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-socket-stats/tests/socket-stats.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-error-handling",
+        "github":"https://github.com/ARMmbed/mbed-os-example-error-handling",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F", "FVP_MPS2_M3"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-error-handling/tests/error-handling.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-filesystem",
+        "github":"https://github.com/ARMmbed/mbed-os-example-filesystem",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["DISCO_L475VG_IOT01A"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-filesystem/tests/filesystem.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-mbed-crypto",
+        "github":"https://github.com/ARMmbed/mbed-os-example-mbed-crypto",
+        "sub-repo-example": true,
+        "subs": ["getting-started"],
+        "features" : [],
+        "targets" : ["K64F"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-mbed-crypto/tests/getting-started.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-psa",
+        "github":"https://github.com/ARMmbed/mbed-os-example-psa",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["ARM_MUSCA_S1", "ARM_MUSCA_B1", "K64F"],
+        "toolchains" : ["GCC_ARM", "ARM"],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 115200,
+        "compare_log": ["mbed-os-example-psa/tests/psa.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-nfc",
+        "github": "https://github.com/ARMmbed/mbed-os-example-nfc",
+        "sub-repo-example": true,
+        "subs": [
+            "NFC_EEPROM",
+            "NFC_SmartPoster"
+        ],
+        "features" : [],
+        "targets" : ["NUCLEO_F401RE"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": [
+            "mbed-os-example-nfc/tests/EEPROM.log",
+            "mbed-os-example-nfc/tests/SmartPoster_noShield.log"
+        ],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-blockdevice",
+        "github":"https://github.com/armmbed/mbed-os-example-blockdevice",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-blockdevice/tests/blockdevice.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-kvstore",
+        "github":"https://github.com/ARMmbed/mbed-os-example-kvstore",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F", "FVP_MPS2_M3"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-kvstore/tests/kvstore.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-crash-reporting",
+        "github":"https://github.com/ARMmbed/mbed-os-example-crash-reporting",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 115200,
+        "compare_log": ["mbed-os-example-crash-reporting/tests/crash-reporting.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-sd-driver",
+        "github":"https://github.com/ARMmbed/mbed-os-example-sd-driver",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : ["K64F"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-sd-driver/tests/sd-driver.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-attestation",
+        "github": "https://github.com/ARMmbed/mbed-os-example-attestation",
+        "sub-repo-example": false,
+        "subs": [],
+        "features" : [],
+        "targets" : [ "K66F", "NUCLEO_F429ZI"],
+        "toolchains" : [],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : true,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-attestation/tests/attestation.log"],
+        "auto-update" : true
+    },
+    {
+        "name": "mbed-os-example-atecc608a",
+        "github": "https://github.com/ARMmbed/mbed-os-example-atecc608a",
+        "sub-repo-example": true,
+        "subs": ["atecc608a"],
+        "features" : [],
+        "targets" : ["K64F"],
+        "toolchains" : ["GCC_ARM"],
+        "exporters": [],
+        "compile" : true,
+        "export": true,
+        "test" : false,
+        "baud_rate": 9600,
+        "compare_log": ["mbed-os-example-atecc608a/tests/atecc608a.log"],
+        "auto-update" : true
+    }
+  ]
 }