diff --git a/lib/api.js b/lib/api.js
index 7be15bb..a179ef6 100644
--- a/lib/api.js
+++ b/lib/api.js
@@ -1,5 +1,6 @@
 const { platformForId, isKnownPlatformId } = require('./platform');
 const { config } = require('./config');
+const { delay } = require('./util');
 
 const Particle = require('particle-api-js');
 
@@ -63,6 +64,23 @@ class ApiClient {
 		return p;
 	}
 
+	async publishEvent(name, data, { retries = 0, retryDelay = 1000 } = {}) {
+		for (;;) {
+			try {
+				await this._api.publishEvent({ name, data, auth: this._token });
+				break;
+			} catch (err) {
+				if (retries <= 0) {
+					throw err;
+				}
+				this._log.warn(`Failed to publish event: ${err.message}\nRetrying in ${retryDelay}ms`);
+				await delay(retryDelay);
+				retryDelay *= 2;
+				--retries;
+			}
+		}
+	}
+
 	setTestDevices(devices) {
 		this._deviceIds = new Set(devices.map(dev => dev.id));
 		this._events.clear();
@@ -110,8 +128,19 @@ class ApiClient {
 			deviceId: 'mine',
 			auth: this._token
 		});
-		this._stream.on('event', event => this._onEvent(event));
-		this._stream.on('error', error => this._onError(error));
+		this._stream.on('event', (event) => this._onEvent(event));
+		this._stream.on('error', (err) => {
+			this._log.error(`Event stream error: ${err.message}`);
+		});
+		this._stream.on('reconnect', () => {
+			this._log.warn('Event stream is reconnecting');
+		});
+		this._stream.on('reconnect-success', () => {
+			this._log.info('Event stream reconnected');
+		});
+		this._stream.on('reconnect-error', (err) => {
+			this._log.error(`Event stream failed to reconnect: ${err.message}`);
+		});
 	}
 
 	_onEvent(event) {
diff --git a/lib/runner.js b/lib/runner.js
index bf84cc1..f099b76 100644
--- a/lib/runner.js
+++ b/lib/runner.js
@@ -248,6 +248,7 @@ class Runner {
 			log: this._log,
 			// Convenience functions
 			receiveEvent: (...args) => this._apiClient.receiveEvent(...args),
+			publishEvent: (...args) => this._apiClient.publishEvent(...args),
 			addDeviceTests: (suite, tests) => this._addDeviceTests(suite, tests)
 		};
 		this._log.verbose('Running tests');
diff --git a/nyc.config.js b/nyc.config.js
index 8ba86bc..b1c5356 100644
--- a/nyc.config.js
+++ b/nyc.config.js
@@ -1,5 +1,5 @@
 module.exports = {
-	branches: 7,
+	branches: 6,
 	lines: 10,
 	functions: 15,
 	statements: 9