SeleniumHQ
diff --git a/‎java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java‎
Lines changed: 10 additions & 5 deletions b/‎java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java‎
Lines changed: 10 additions & 5 deletions
@@ -24,6 +24,7 @@
 
 import com.google.common.base.Throwables;
 
+import org.junit.AssumptionViolatedException;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.RuleChain;
@@ -112,9 +113,7 @@ protected void starting(Description description) {
         removeDriver();
       }
       try {
-        driver = actuallyCreateDriver();
-        wait = new WebDriverWait(driver, 30);
-        shortWait = new WebDriverWait(driver, 5);
+        createDriver();
       } catch (Exception e) {
         throw new RuntimeException("Exception creating driver", e);
       }
@@ -159,11 +158,11 @@ public void evaluate() throws Throwable {
     }
 
     private void dealWithSauceFailureIfNecessary(Throwable t) {
-      if (t.getMessage() != null
+      if (!(t instanceof AssumptionViolatedException) && t.getMessage() != null
           && (t.getMessage().contains("sauce") || t.getMessage().contains("Sauce"))) {
         removeDriver();
         try {
-          actuallyCreateDriver();
+          createDriver();
         } catch (Exception e) {
           throw new RuntimeException("Exception creating driver, after Sauce-detected exception", e);
         }
@@ -267,6 +266,12 @@ public WebDriver getWrappedDriver() {
     return storedDriver.get();
   }
 
+  private void createDriver() {
+    driver = actuallyCreateDriver();
+    wait = new WebDriverWait(driver, 30);
+    shortWait = new WebDriverWait(driver, 5);
+  }
+
   public static WebDriver actuallyCreateDriver() {
     WebDriver driver = storedDriver.get();