diff --git a/test/visual/test.js b/test/visual/test.js
index 2d4e210..bfebeff 100644
--- a/test/visual/test.js
+++ b/test/visual/test.js
@@ -1,25 +1,26 @@
 gemini.suite('vaadin-button', function(rootSuite) {
-  // Hack needed for
-  // - Edge (https://github.com/vaadin/vaadin-text-field/issues/10)
-  // - Making sure that animations have finished
-  // - FF has async focused the input.
   function wait(actions, find) {
     actions.wait(5000);
   }
 
+  function goToAboutBlank(actions, find) {
+    // Firefox stops responding on socket after a test, workaround:
+    return actions.executeJS(function(window) {
+      window.location.href = 'about:blank'; // just go away, please!
+    });
+  }
+
+  rootSuite
+    .before(wait)
+    .after(goToAboutBlank);
+
   gemini.suite('default-tests', function(suite) {
     suite
       .setUrl('/default.html')
       .setCaptureElements('#default-tests')
-      .capture('default', {}, wait)
+      .capture('default')
       .capture('focus-tabindex', function(actions) {
         actions.sendKeys(gemini.TAB);
-      })
-      .after(function(actions, find) {
-        // Firefox stops responding on socket after a test, workaround:
-        return actions.executeJS(function(window) {
-          window.location.href = 'about:blank'; // just go away, please!
-        });
       });
   });
 
@@ -27,13 +28,7 @@ gemini.suite('vaadin-button', function(rootSuite) {
     suite
       .setUrl('styling.html')
       .setCaptureElements('vaadin-button')
-      .capture('default', {}, wait)
-      .after(function(actions, find) {
-        // Firefox stops responding on socket after a test, workaround:
-        return actions.executeJS(function(window) {
-          window.location.href = 'about:blank'; // just go away, please!
-        });
-      });
+      .capture('default');
   });
 
 });