diff --git a/test/integration/index.js b/test/integration/index.js
index 1451c87e4..cabec784f 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -19,6 +19,11 @@
 
 'use strict'
 
+process.on('unhandledRejection', function (err) {
+  console.error(err)
+  process.exit(1)
+})
+
 const { writeFileSync, readFileSync, accessSync, mkdirSync, readdirSync, statSync } = require('fs')
 const { join, sep } = require('path')
 const yaml = require('js-yaml')
@@ -203,8 +208,11 @@ async function start ({ client, isXPack }) {
       const tests = data
         .split('\n---\n')
         .map(s => s.trim())
+        // empty strings
         .filter(Boolean)
         .map(parse)
+        // null values
+        .filter(Boolean)
 
       // get setup and teardown if present
       var setupTest = null