diff --git a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
index dc74ab74b50..f4a1b6e4c2d 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/CriticalNotificationsTest.java
@@ -1,14 +1,25 @@
 package com.vaadin.tests.application;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserThemeTest;
 
 public class CriticalNotificationsTest extends MultiBrowserThemeTest {
 
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+                Browser.FIREFOX.getDesiredCapabilities());
+    }
+
     @Test
     public void internalError() throws Exception {
         testCriticalNotification("Internal error");
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
index ff0d692e1d1..a01d4d8fa06 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxItemIconTest.java
@@ -1,18 +1,29 @@
 package com.vaadin.tests.components.combobox;
 
+import java.util.Arrays;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 import org.openqa.selenium.Keys;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
 import com.vaadin.testbench.elements.ComboBoxElement;
+import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 @TestCategory("xvfb-test")
 public class ComboBoxItemIconTest extends MultiBrowserTest {
 
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+                Browser.FIREFOX.getDesiredCapabilities());
+    }
+
     @Test
     public void testIconsInComboBox() throws Exception {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
index ee18a02799a..9631b5313c2 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticReindeerTest.java
@@ -1,11 +1,22 @@
 package com.vaadin.tests.components.progressindicator;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ProgressBarElement;
+import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class ProgressBarStaticReindeerTest extends MultiBrowserTest {
+
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+                Browser.FIREFOX.getDesiredCapabilities());
+    }
     @Test
     public void compareScreenshot() throws Exception {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
index dc13ff7cbd9..40efe8484c4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/progressindicator/ProgressBarStaticRunoTest.java
@@ -1,11 +1,23 @@
 package com.vaadin.tests.components.progressindicator;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ProgressBarElement;
+import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class ProgressBarStaticRunoTest extends MultiBrowserTest {
+
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+                Browser.FIREFOX.getDesiredCapabilities());
+    }
+
     @Test
     public void compareScreenshot() throws Exception {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
index d92190a0140..cc6cdafd9a6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java
@@ -3,20 +3,30 @@
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 
 import org.junit.Test;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.testbench.elements.TableElement.ContextMenuElement;
+import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
 
+    @Override
+    public List<DesiredCapabilities> getBrowsersToTest() {
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
+                Browser.FIREFOX.getDesiredCapabilities());
+    }
+
     @Test
     public void expandCorrectlyAfterCollapse() throws IOException {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java
index fb095c07b49..cd7afec9cab 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/WindowControlButtonFocusTest.java
@@ -9,6 +9,7 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
+import com.vaadin.testbench.annotations.RunLocally;
 import com.vaadin.testbench.elements.WindowElement;
 import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -17,8 +18,7 @@ public class WindowControlButtonFocusTest extends MultiBrowserTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        return Arrays.asList(Browser.CHROME.getDesiredCapabilities(),
-                Browser.IE11.getDesiredCapabilities());
+        return Arrays.asList(Browser.CHROME.getDesiredCapabilities());
     }
 
     @Test