diff --git a/test/test.js b/test/test.js
index eefc3f9095..fc6aca15bf 100644
--- a/test/test.js
+++ b/test/test.js
@@ -202,7 +202,10 @@ describe("Test Screenshots", function() {
         done();
       }),
       () => {
-        driver.setContext(firefox.Context.CONTENT);
+        return driver.setContext(firefox.Context.CONTENT)
+          .then(() => driver.getAllWindowHandles())
+          .then((tabs) => driver.switchTo().window(tabs[tabs.length - 1]))
+          .then(() => driver.switchTo().defaultContent());
       }).catch(done);
   });