diff --git a/spec/integration/helpers/start-atom.js b/spec/integration/helpers/start-atom.js
index 2fecc6c63..2478d1913 100644
--- a/spec/integration/helpers/start-atom.js
+++ b/spec/integration/helpers/start-atom.js
@@ -155,7 +155,12 @@ Logs:\n${chromedriverLogs.join('\n')}\
     }
 
     console.log('>>> Waiting for test to run')
-    await fn(client)
+    try {
+      await fn(client)
+    } catch (error) {
+      console.log('!!!!!!!!!')
+      console.log(error)
+    }
     finish()
   }
   , 30000)
diff --git a/spec/integration/smoke-spec.js b/spec/integration/smoke-spec.js
index aa6cc79c1..5af7b9cd1 100644
--- a/spec/integration/smoke-spec.js
+++ b/spec/integration/smoke-spec.js
@@ -46,12 +46,12 @@ fdescribe('Smoke Test', () => {
       console.log('>>> Waiting for there to be one pane item')
       await client.waitForPaneItemCount(1, 1000)
 
-      textEditorElement.click()
+      console.log('>>> Waiting to click text editor')
+      await textEditorElement.click()
 
-      console.log('>>> Waiting for active element to be atom-text-editor')
-      await client.waitUntil(function () {
-        return this.execute(() => document.activeElement.closest('atom-text-editor'))
-      }, 5000)
+      console.log('>>> Waiting for closest element')
+      const closestElement = await client.execute(() => document.activeElement.closest('atom-text-editor'))
+      expect(closestElement).not.toBeNull()
 
       console.log('>>> Waiting for text to be inserted')
       await client.keys('Hello!')