diff --git a/.travis.yml b/.travis.yml
index 3f7490830..7600cf881 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,21 +31,18 @@ node_js:
 matrix:
   include:
     - node_js: 7
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-4.8
+            - g++-4.8
+      env:
+        - CXX=g++-4.8
+      install: yarn install
       script: yarn run test:visual:run --no-clean
 
-# Install a C++11 compatible compiler
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - gcc-4.8
-      - g++-4.8
-
-# Set C++ compiler as default
-env:
-  - CXX=g++-4.8
-
 # Limit clone depth to 5, to speed up build
 git:
   depth: 5
@@ -57,6 +54,9 @@ cache:
   directories:
     - node_modules
 
+# Do not install optional dependencies by default
+install: yarn install --ignore-optional
+
 # Install dependencies
 before_script:
   - pip install --user -r requirements.txt
diff --git a/package.json b/package.json
index bde65fb4a..69cdec455 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "eslint": "^3.14.0",
     "eslint-plugin-mocha": "^4.8.0",
     "fastclick": "^1.0.6",
-    "gemini": "^4.14.3",
     "git-hooks": "^1.1.7",
     "gulp": "^3.9.1",
     "gulp-changed": "^1.3.2",
@@ -90,8 +89,6 @@
     "moniker": "^0.1.2",
     "node-notifier": "^5.0.0",
     "postcss-pseudo-classes": "^0.1.0",
-    "sauce-connect-launcher": "^1.2.0",
-    "selenium-standalone": "^6.0.0",
     "stylelint": "^7.8.0",
     "stylelint-config-standard": "^16.0.0",
     "stylelint-order": "^0.2.2",
@@ -103,6 +100,11 @@
     "whatwg-fetch": "^2.0.1",
     "yargs": "^6.6.0"
   },
+  "optionalDependencies": {
+    "gemini": "^4.14.3",
+    "sauce-connect-launcher": "^1.2.0",
+    "selenium-standalone": "^6.0.0"
+  },
   "engines": {
     "node": ">= 4.5.0"
   },
diff --git a/tests/visual/config/gemini.sauce-connect.json b/tests/visual/config/gemini.sauce-connect.json
index 38912d952..6ea0d3c7c 100644
--- a/tests/visual/config/gemini.sauce-connect.json
+++ b/tests/visual/config/gemini.sauce-connect.json
@@ -9,7 +9,8 @@
         "platform": "Windows 10",
         "screenResolution": "1280x1024",
         "recordVideo": "false"
-      }
+      },
+      "retry": 1
     },
     "firefox": {
       "desiredCapabilities": {
@@ -18,7 +19,8 @@
         "platform": "Windows 10",
         "screenResolution": "1280x1024",
         "recordVideo": "false"
-      }
+      },
+      "retry": 1
     },
     "edge": {
       "desiredCapabilities": {
@@ -26,7 +28,8 @@
         "platform": "Windows 10",
         "screenResolution": "1280x1024",
         "recordVideo": "false"
-      }
+      },
+      "retry": 1
     },
     "ie11": {
       "desiredCapabilities": {
@@ -35,7 +38,8 @@
         "platform": "Windows 10",
         "screenResolution": "1280x1024",
         "recordVideo": "false"
-      }
+      },
+      "retry": 1
     },
     "ie10": {
       "desiredCapabilities": {
@@ -44,7 +48,8 @@
         "platform": "Windows 8",
         "screenResolution": "1280x1024",
         "recordVideo": "false"
-      }
+      },
+      "retry": 1
     }
   },
   "system": {