diff --git a/.github/workflows/fsanitize-check.yml b/.github/workflows/fsanitize-check.yml
index 7ec5483bf..ee87798ef 100644
--- a/.github/workflows/fsanitize-check.yml
+++ b/.github/workflows/fsanitize-check.yml
@@ -11,6 +11,8 @@ jobs:
 
     runs-on: ubuntu-latest
     timeout-minutes: 5
+    env:
+      WOLFMQTT_NO_EXTERNAL_BROKER_TESTS: 1
 
     steps:
     - uses: actions/checkout@master
diff --git a/.github/workflows/macos-check.yml b/.github/workflows/macos-check.yml
index eea2f48a8..1474e1f26 100644
--- a/.github/workflows/macos-check.yml
+++ b/.github/workflows/macos-check.yml
@@ -11,6 +11,8 @@ jobs:
 
     runs-on: macos-latest
     timeout-minutes: 10
+    env:
+      WOLFMQTT_NO_EXTERNAL_BROKER_TESTS: 1
     steps:
     - uses: actions/checkout@master
       with:
diff --git a/.github/workflows/ubuntu-check.yml b/.github/workflows/ubuntu-check.yml
index c0a65c04a..7baf97b18 100644
--- a/.github/workflows/ubuntu-check.yml
+++ b/.github/workflows/ubuntu-check.yml
@@ -18,10 +18,10 @@ jobs:
         repository: wolfssl/wolfssl
         path: wolfssl
     - name: wolfssl autogen
-      working-directory: ./wolfssl        
+      working-directory: ./wolfssl
       run: ./autogen.sh
     - name: wolfssl configure
-      working-directory: ./wolfssl 
+      working-directory: ./wolfssl
       run: ./configure --enable-enckeys
     - name: wolfssl make
       working-directory: ./wolfssl
@@ -43,6 +43,8 @@ jobs:
       if: ${{ failure() && steps.make-check.outcome == 'failure' }}
       run: |
         more test-suite.log
+      env: 
+        WOLFMQTT_NO_EXTERNAL_BROKER_TESTS: 1
     - name: configure with SN Enabled
       run: ./configure --enable-sn
     - name: make
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8c6b7354..f38bffdc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,7 @@ if (WOLFMQTT_EXAMPLES)
     add_mqtt_example(fwpush firmware/fwpush.c)
     add_mqtt_example(fwclient firmware/fwclient.c)
     add_mqtt_example(mqtt-pub pub-sub/mqtt-pub.c)
-    add_mqtt_example(mqtt-pub pub-sub/mqtt-sub.c)
+    add_mqtt_example(mqtt-sub pub-sub/mqtt-sub.c)
 endif()
 
 ####################################################
diff --git a/scripts/awsiot.test b/scripts/awsiot.test
index 9bff5f945..a153dcf41 100755
--- a/scripts/awsiot.test
+++ b/scripts/awsiot.test
@@ -5,18 +5,22 @@
 # Check for application
 [ ! -x ./examples/aws/awsiot ] && echo -e "\n\nAWS IoT MQTT Client doesn't exist" && exit 1
 
-def_args="-T -C 2000"
+if test -n "$WOLFMQTT_NO_EXTERNAL_BROKER_TESTS"; then
+    echo "WOLFMQTT_NO_EXTERNAL_BROKER_TESTS set, won't run"
+else
+    def_args="-T -C 2000"
 
-# Run with TLS and QoS 0-1
+    # Run with TLS and QoS 0-1
 
-./examples/aws/awsiot $def_args -t -q 0 $1
-RESULT=$?
-[ $RESULT -ne 0 ] && echo -e "\n\nAWS IoT MQTT Client failed! TLS=On, QoS=0" && exit 1
+    ./examples/aws/awsiot $def_args -t -q 0 $1
+    RESULT=$?
+    [ $RESULT -ne 0 ] && echo -e "\n\nAWS IoT MQTT Client failed! TLS=On, QoS=0" && exit 1
 
-./examples/aws/awsiot $def_args -t -q 1 $1
-RESULT=$?
-[ $RESULT -ne 0 ] && echo -e "\n\nAWS IoT MQTT Client failed! TLS=On, QoS=1" && exit 1
+    ./examples/aws/awsiot $def_args -t -q 1 $1
+    RESULT=$?
+    [ $RESULT -ne 0 ] && echo -e "\n\nAWS IoT MQTT Client failed! TLS=On, QoS=1" && exit 1
 
-echo -e "\n\nAWS IoT MQTT Client Tests Passed"
+    echo -e "\n\nAWS IoT MQTT Client Tests Passed"
+fi
 
 exit 0
diff --git a/scripts/azureiothub.test b/scripts/azureiothub.test
index e180e45fe..37c94d193 100755
--- a/scripts/azureiothub.test
+++ b/scripts/azureiothub.test
@@ -5,18 +5,22 @@
 # Check for application
 [ ! -x ./examples/azure/azureiothub ] && echo -e "\n\nAzureIotHub MQTT Client doesn't exist" && exit 1
 
-def_args="-T -C 2000"
+if test -n "$WOLFMQTT_NO_EXTERNAL_BROKER_TESTS"; then
+    echo "WOLFMQTT_NO_EXTERNAL_BROKER_TESTS set, won't run"
+else
+    def_args="-T -C 2000"
 
-# Run with TLS and QoS 0-1
+    # Run with TLS and QoS 0-1
 
-./examples/azure/azureiothub $def_args -t -q 0 $1
-RESULT=$?
-[ $RESULT -ne 0 ] && echo -e "\n\nAzureIotHub MQTT Client failed! TLS=On, QoS=0" && exit 1
+    ./examples/azure/azureiothub $def_args -t -q 0 $1
+    RESULT=$?
+    [ $RESULT -ne 0 ] && echo -e "\n\nAzureIotHub MQTT Client failed! TLS=On, QoS=0" && exit 1
 
-./examples/azure/azureiothub $def_args -t -q 1 $1
-RESULT=$?
-[ $RESULT -ne 0 ] && echo -e "\n\nAzureIotHub MQTT Client failed! TLS=On, QoS=1" && exit 1
+    ./examples/azure/azureiothub $def_args -t -q 1 $1
+    RESULT=$?
+    [ $RESULT -ne 0 ] && echo -e "\n\nAzureIotHub MQTT Client failed! TLS=On, QoS=1" && exit 1
 
-echo -e "\n\nAzureIotHub MQTT Client Tests Passed"
+    echo -e "\n\nAzureIotHub MQTT Client Tests Passed"
+fi
 
 exit 0