diff --git a/iot/api-client/manager/manager_test.py b/iot/api-client/manager/manager_test.py
index 36a209f153e..ae5cb5e7172 100644
--- a/iot/api-client/manager/manager_test.py
+++ b/iot/api-client/manager/manager_test.py
@@ -391,7 +391,6 @@ def test_send_command(test_topic, capsys):
 
     # Pre-process commands
     for i in range(1, 5):
-        client.loop()
         time.sleep(1)
 
     manager.send_command(
@@ -401,10 +400,11 @@ def test_send_command(test_topic, capsys):
 
     # Process commands
     for i in range(1, 5):
-        client.loop()
         time.sleep(1)
 
     # Clean up
+    client.loop_stop()
+    client.disconnect()
     manager.delete_device(
             service_account_json, project_id, cloud_region, registry_id,
             device_id)
diff --git a/iot/api-client/mqtt_example/cloudiot_mqtt_example.py b/iot/api-client/mqtt_example/cloudiot_mqtt_example.py
index 8e2d085fd64..717d8d16e71 100644
--- a/iot/api-client/mqtt_example/cloudiot_mqtt_example.py
+++ b/iot/api-client/mqtt_example/cloudiot_mqtt_example.py
@@ -242,6 +242,8 @@ def listen_for_messages(
         if seconds_since_issue > 60 * jwt_exp_mins:
             print('Refreshing token after {}s'.format(seconds_since_issue))
             jwt_iat = datetime.datetime.utcnow()
+            client.loop()
+            client.disconnect()
             client = get_client(
                 project_id, cloud_region, registry_id, gateway_id,
                 private_key_file, algorithm, ca_certs, mqtt_bridge_hostname,
@@ -457,6 +459,8 @@ def mqtt_device_demo(args):
         if seconds_since_issue > 60 * jwt_exp_mins:
             print('Refreshing token after {}s'.format(seconds_since_issue))
             jwt_iat = datetime.datetime.utcnow()
+            client.loop()
+            client.disconnect()
             client = get_client(
                 args.project_id, args.cloud_region,
                 args.registry_id, args.device_id, args.private_key_file,
@@ -469,7 +473,9 @@ def mqtt_device_demo(args):
         client.publish(mqtt_topic, payload, qos=1)
 
         # Send events every second. State should not be updated as often
-        time.sleep(1 if args.message_type == 'event' else 5)
+        for i in range(0, 60):
+            time.sleep(1)
+            client.loop()
     # [END iot_mqtt_run]