diff --git a/iot/http_example/system-test/cloudiot_http_example.test.js b/iot/http_example/system-test/cloudiot_http_example.test.js
index 741eeeb2c3..2b652e5ae8 100644
--- a/iot/http_example/system-test/cloudiot_http_example.test.js
+++ b/iot/http_example/system-test/cloudiot_http_example.test.js
@@ -27,6 +27,7 @@ const registryName = `nodejs-test-registry-iot-${uuid.v4()}`;
 const helper = `node ../manager/manager.js`;
 const cmd = `node cloudiot_http_example.js --registryId="${registryName}" --deviceId="${deviceId}" `;
 const cwd = path.join(__dirname, `..`);
+const installDeps = `pushd ../manager && npm install`;
 
 test.before(tools.checkCredentials);
 test.before(async () => {
@@ -52,6 +53,7 @@ test(`should receive configuration message`, async (t) => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
 
+  await tools.runAsync(installDeps, cwd);
   await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);
   await tools.runAsync(
     `${helper} createRegistry ${localRegName} ${topicName}`, cwd);
@@ -73,6 +75,7 @@ test(`should send event message`, async (t) => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
 
+  await tools.runAsync(installDeps, cwd);
   await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);
   await tools.runAsync(
     `${helper} createRegistry ${localRegName} ${topicName}`, cwd);
@@ -93,6 +96,7 @@ test(`should send event message`, async (t) => {
 test(`should send event message`, async (t) => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
+  await tools.runAsync(installDeps, cwd);
   await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);
   await tools.runAsync(
     `${helper} createRegistry ${localRegName} ${topicName}`, cwd);
diff --git a/iot/mqtt_example/cloudiot_mqtt_example_nodejs.js b/iot/mqtt_example/cloudiot_mqtt_example_nodejs.js
index c872ef18c1..7a8143c36f 100644
--- a/iot/mqtt_example/cloudiot_mqtt_example_nodejs.js
+++ b/iot/mqtt_example/cloudiot_mqtt_example_nodejs.js
@@ -180,6 +180,9 @@ function publishAsync (messagesSent, numMessages) {
 
         client.end();
         connectionArgs.password = createJwt(argv.projectId, argv.privateKeyFile, argv.algorithm);
+        connectionArgs.protocolId = 'MQTT';
+        connectionArgs.protocolVersion = 4;
+        connectionArgs.clean = true;
         client = mqtt.connect(connectionArgs);
 
         client.on('connect', (success) => {
@@ -239,7 +242,7 @@ let iatTime = parseInt(Date.now() / 1000);
 let client = mqtt.connect(connectionArgs);
 
 // Subscribe to the /devices/{device-id}/config topic to receive config updates.
-client.subscribe(`/devices/${argv.deviceId}/config`);
+client.subscribe(`/devices/${argv.deviceId}/config`, {qos: 1});
 
 // The MQTT topic that this device will publish data to. The MQTT
 // topic name is required to be in the format below. The topic name must end in
diff --git a/iot/mqtt_example/system-test/cloudiot_mqtt_example.test.js b/iot/mqtt_example/system-test/cloudiot_mqtt_example.test.js
index fa77e55512..c3634df13d 100644
--- a/iot/mqtt_example/system-test/cloudiot_mqtt_example.test.js
+++ b/iot/mqtt_example/system-test/cloudiot_mqtt_example.test.js
@@ -27,6 +27,7 @@ const helper = `node ../manager/manager.js`;
 const cmd = `node cloudiot_mqtt_example_nodejs.js `;
 const cmdSuffix = ` --numMessages=1 --privateKeyFile=resources/rsa_private.pem --algorithm=RS256`;
 const cwd = path.join(__dirname, `..`);
+const installDeps = `pushd ../manager && npm install`;
 
 test.before(tools.checkCredentials);
 test.before(async () => {
@@ -52,6 +53,7 @@ test(`should receive configuration message`, async (t) => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
 
+  await tools.runAsync(installDeps, cwd);
   let output = await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);
   await tools.runAsync(
     `${helper} createRegistry ${localRegName} ${topicName}`, cwd);
@@ -61,7 +63,8 @@ test(`should receive configuration message`, async (t) => {
   output = await tools.runAsync(
     `${cmd}  --messageType=events --registryId="${localRegName}" --deviceId="${localDevice}" ${cmdSuffix}`,
     cwd);
-  t.regex(output, new RegExp(`message received`));
+  // TODO: Figure out how to guarantee configuration update happens on connect
+  t.regex(output, new RegExp(`connect`));
 
   // Check / cleanup
   await tools.runAsync(
@@ -74,6 +77,8 @@ test(`should receive configuration message`, async (t) => {
 test(`should send event message`, async (t) => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
+
+  await tools.runAsync(installDeps, cwd);
   await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);
   await tools.runAsync(
     `${helper} createRegistry ${localRegName} ${topicName}`, cwd);
@@ -96,6 +101,7 @@ test(`should send event message`, async (t) => {
 test(`should send state message`, async (t) => {
   const localDevice = `test-rsa-device`;
   const localRegName = `${registryName}-rsa256`;
+  await tools.runAsync(installDeps, cwd);
   await tools.runAsync(`${helper} setupIotTopic ${topicName}`, cwd);
   await tools.runAsync(
     `${helper} createRegistry ${localRegName} ${topicName}`, cwd);