Remove IE8-IE10 related test code

Change-Id: Iadacd329c8da969c5ad046abd87db28ac6eade0c

61 files changed, 51 insertions, 1271 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
index c287425741..c6bde32ad2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
@@ -17,7 +17,6 @@
 package com.vaadin.tests.components.abstractcomponent;
 
 import com.vaadin.server.VaadinRequest;
-import com.vaadin.server.WebBrowser;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.Label;
 
@@ -29,13 +28,6 @@ public class RemSizeUnitTest extends AbstractTestUI {
         label.setHeight("5rem");
         label.setWidth(10.5f, Unit.REM);
 
-        // Rem not supported in ie8, fake using pixels
-        WebBrowser webBrowser = getPage().getWebBrowser();
-        if (webBrowser.isIE() && webBrowser.getBrowserMajorVersion() == 8) {
-            label.setHeight("80px");
-            label.setWidth("168px");
-        }
-
         addComponent(label);
     }
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
deleted file mode 100644
index 47f6795e0e..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonsInHorizontalLayout.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.vaadin.tests.components.button;
-
-import com.vaadin.tests.components.AbstractTestCase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.LegacyWindow;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.themes.BaseTheme;
-
-public class ButtonsInHorizontalLayout extends AbstractTestCase {
-
-    @Override
-    public void init() {
-        VerticalLayout content = new VerticalLayout();
-        content.setMargin(true);
-        content.setSpacing(true);
-
-        content.addComponent(createButtonLayout(null));
-        content.addComponent(createButtonLayout(BaseTheme.BUTTON_LINK));
-
-        setMainWindow(new LegacyWindow("", content));
-    }
-
-    private HorizontalLayout createButtonLayout(String style) {
-        HorizontalLayout layout = new HorizontalLayout();
-        layout.setSpacing(true);
-        layout.addComponent(createButton(style));
-        layout.addComponent(createButton(style));
-        layout.addComponent(createButton(style));
-        return layout;
-    }
-
-    private Button createButton(String style) {
-        Button button = new Button(
-                "Look at me in IE7 or IE8 in compatibility mode");
-        if (style != null && style.length() != 0) {
-            button.setStyleName(style);
-        }
-        return button;
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Tests for rendering of buttons in a HorizontalLayout";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 7978;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
deleted file mode 100644
index 70d16fb62a..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScroll.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2000-2013 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.combobox;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.ComboBox;
-
-/**
- * Test UI for issue #13488, where scrolling to the next page with pagelength 0
- * would break the rendering of any page except the first.
- *
- * @author Vaadin Ltd
- */
-@SuppressWarnings("serial")
-public class ComboboxPageLengthZeroScroll extends AbstractTestUI {
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        ComboBox combobox = new ComboBox("New items enabled:");
-        combobox.setPageLength(0);
-
-        for (int i = 0; i++ < 10;) {
-            combobox.addItem("1 AMERICAN SAMOA " + i);
-            combobox.addItem("ANTIGUA AND BARBUDA " + i);
-        }
-
-        getLayout().addComponent(combobox);
-        getLayout().addComponent(new Button("dummy"));
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "Scrolling with pagelength == 0 previously resulted in broken style, should be fixed now";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 13488;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
deleted file mode 100644
index c5c2517c09..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpen.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.popupview;
-
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Component;
-import com.vaadin.ui.PopupView;
-import com.vaadin.ui.VerticalLayout;
-
-/**
- * Resizing PopupView's popup component while it is visible should also resize
- * the drop shadow of the overlay.
- *
- * @author Vaadin Ltd
- */
-public class PopupViewResizeWhileOpen extends AbstractTestUI {
-
-    @Override
-    protected void setup(VaadinRequest request) {
-        PopupView pv = new PopupView(new PopupView.Content() {
-            @Override
-            public Component getPopupComponent() {
-                final VerticalLayout popupComponent = new VerticalLayout();
-                popupComponent.setId("content-vl");
-                popupComponent.setWidth("640px");
-                popupComponent.setHeight("480px");
-
-                Button button = new Button("Change height!",
-                        new Button.ClickListener() {
-                            @Override
-                            public void buttonClick(Button.ClickEvent event) {
-                                popupComponent.setHeight("320px");
-                            }
-                        });
-
-                popupComponent.addComponent(button);
-                return popupComponent;
-            }
-
-            @Override
-            public String getMinimizedValueAsHTML() {
-                return "Click me!";
-            }
-        });
-        pv.setHideOnMouseOut(false);
-        addComponent(pv);
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "Resize PopupView's content component while visible";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 13666;
-    }
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
deleted file mode 100644
index dbf5c03110..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaPreventsTextFieldAccess.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package com.vaadin.tests.components.richtextarea;
-
-import com.vaadin.legacy.ui.LegacyTextField;
-import com.vaadin.shared.ui.label.ContentMode;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.RichTextArea;
-import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Window;
-
-public class RichTextAreaPreventsTextFieldAccess extends TestBase {
-
-    @Override
-    protected void setup() {
-        Label label = new Label("Steps to reproduce problem with IE8. "
-                + "<br> Step 1: Click on the 'Open RichTextArea-Dialog' button "
-                + "<br> Step 2: Write something in the RichTextArea. "
-                + "Do not press outside the textfield for the "
-                + "richTextArea. <br> Step 3: Press the 'removeWindowButton' "
-                + "<br> Now you cannot write in the TextField on this page "
-                + "<br> Resetting the focus to textfield explicitly, works around the issue");
-        label.setContentMode(ContentMode.HTML);
-        addComponent(label);
-
-        final LegacyTextField testField = new LegacyTextField("");
-        testField.setId("field");
-        addComponent(testField);
-
-        final RichTextArea rText = new RichTextArea();
-        rText.setWidth("300px");
-        rText.setHeight("300px");
-
-        final Window subWindow = new Window("SubWindow");
-        subWindow.setWidth("500px");
-        subWindow.setHeight("500px");
-        subWindow.setModal(true);
-
-        final VerticalLayout wLayout = new VerticalLayout();
-        subWindow.setContent(wLayout);
-
-        wLayout.addComponent(rText);
-        wLayout.addComponent(new LegacyTextField());
-
-        Button addWindowButton = new Button("Open RichTextArea-Dialog");
-        addWindowButton.addClickListener(new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                getMainWindow().addWindow(subWindow);
-
-            }
-        });
-        addComponent(addWindowButton);
-
-        Button removeWindowButton = new Button("removeWindowButton");
-        removeWindowButton.addClickListener(new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                getMainWindow().removeWindow(subWindow);
-
-            }
-        });
-        wLayout.addComponent(removeWindowButton);
-
-        Button focusButton = new Button("Set focus on TextField");
-        focusButton.addClickListener(new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                testField.focus();
-
-            }
-        });
-        addComponent(focusButton);
-
-        Button removeRTA = new Button("Remove RTA");
-        removeRTA.addClickListener(new Button.ClickListener() {
-
-            @Override
-            public void buttonClick(ClickEvent event) {
-                wLayout.removeComponent(rText);
-
-            }
-        });
-        wLayout.addComponent(removeRTA);
-
-        CheckBox cb = new CheckBox("close");
-        cb.setImmediate(true);
-        cb.addValueChangeListener(
-                event -> getMainWindow().removeWindow(subWindow));
-        wLayout.addComponent(cb);
-
-    }
-
-    @Override
-    protected String getDescription() {
-        return "RichtextArea prevents TextField access in IE8";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 10776;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java b/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
deleted file mode 100644
index 0b3301bb4e..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/select/SelectIconPlacement.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.vaadin.tests.components.select;
-
-import com.vaadin.server.ThemeResource;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Select;
-
-public class SelectIconPlacement extends TestBase {
-    private static final long serialVersionUID = 1L;
-
-    private Select mySelect;
-
-    @Override
-    protected void setup() {
-        for (String width : new String[] { null, "200px" }) {
-            String icon = "error.png";
-            if (width == null) {
-                icon = "bullet.png";
-            }
-            mySelect = new Select("Width: " + (width == null ? "auto" : width));
-            String bar = "Only item";
-            mySelect.addItem(bar);
-            mySelect.setItemIcon(bar,
-                    new ThemeResource("common/icons/" + icon + "?w=" + width));
-            mySelect.select(bar);
-            mySelect.setWidth(width);
-            addComponent(mySelect);
-        }
-
-    }
-
-    @Override
-    protected String getDescription() {
-        return "A select with item icons pushes the caption of that item to the right to make room for the icon. It works fine in all browsers except IE8.<br/>"
-                + "Upon component render the icon and caption is on top of each others, and it corrects itself when you open the dropdown. <br/><br/>";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 3991;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java b/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
deleted file mode 100644
index 8da6759b20..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/tree/TreeWithPreselectedItemNotShown.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.vaadin.tests.components.tree;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Tree;
-import com.vaadin.ui.Window;
-
-public class TreeWithPreselectedItemNotShown extends TestBase {
-
-    @Override
-    protected void setup() {
-        Button open = new Button("Open modal window with tree",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(Button.ClickEvent event) {
-                        getMainWindow().addWindow(new SubwindowWithTree());
-                    }
-                });
-
-        addComponent(open);
-    }
-
-    private class SubwindowWithTree extends Window {
-
-        private SubwindowWithTree() {
-            super("Tree here");
-
-            String itemId1 = "Item 1";
-            String itemId2 = "Item 2";
-
-            Tree tree = new Tree();
-
-            tree.addItem(itemId1);
-            tree.addItem(itemId2);
-
-            // todo error here
-            tree.select(itemId1);
-
-            addComponent(tree);
-        }
-    }
-
-    @Override
-    protected String getDescription() {
-        return "IE8 doesn't display a tree if an item has been selected before the tree becomes visible";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 6878;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java b/uitest/src/main/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java
deleted file mode 100644
index 121d6300bc..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.vaadin.tests.components.window;
-
-import com.vaadin.annotations.Theme;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.Window;
-
-@SuppressWarnings("serial")
-@Theme("chameleon")
-public class WindowBGColorChameleonIE8 extends AbstractTestUI {
-
-    @Override
-    protected void setup(VaadinRequest request) {
-
-        final Window window = new Window();
-        window.setCaption("Window");
-        window.setModal(true);
-        window.setClosable(true);
-        window.setDraggable(true);
-        window.setWidth("400px");
-        window.setHeight("300px");
-        window.center();
-        final UI ui = UI.getCurrent();
-        ui.addWindow(window);
-    }
-}
\ No newline at end of file
diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java b/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
deleted file mode 100644
index 1dc00be810..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/extensions/LayoutMemoryUsageIE8Extension.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.extensions;
-
-import com.vaadin.server.AbstractExtension;
-import com.vaadin.ui.UI;
-
-/**
- * Test extension for finding out the size of the measuredSizes map of
- * LayoutManagerIE8.
- *
- * This UI extension uses JSNI to register a JavaScript method
- * window.vaadin.getMeasuredSizesCount() that can be used to query the size of
- * the internal map of the layout manager. It should only be used on IE8.
- *
- * @since 7.1.13
- * @author Vaadin Ltd
- */
-public class LayoutMemoryUsageIE8Extension extends AbstractExtension {
-    public void extend(UI target) {
-        super.extend(target);
-    }
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java b/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
deleted file mode 100644
index 6decc857b6..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeak.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.layouts;
-
-import com.vaadin.annotations.Widgetset;
-import com.vaadin.server.VaadinRequest;
-import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.extensions.LayoutMemoryUsageIE8Extension;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.HasComponents;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.VerticalLayout;
-
-@Widgetset("com.vaadin.tests.widgetset.TestingWidgetSet")
-public class IE8MeasuredSizeMemoryLeak extends AbstractTestUI {
-
-    private boolean state = false;
-
-    private HasComponents component1 = new VerticalLayout() {
-        {
-            for (int i = 1; i <= 200; i++) {
-                String idText = "ID:" + i;
-                Label c = new Label(idText);
-                c.setId(idText);
-                addComponent(c);
-            }
-        }
-    };
-
-    private HasComponents component2 = new VerticalLayout() {
-        {
-            for (int i = 201; i <= 400; i++) {
-                String idText = "ID:" + i;
-                Label c = new Label(idText);
-                c.setId(idText);
-                addComponent(c);
-            }
-        }
-    };
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
-     * VaadinRequest)
-     */
-    @Override
-    protected void setup(VaadinRequest request) {
-        new LayoutMemoryUsageIE8Extension().extend(this);
-
-        VerticalLayout layout = new VerticalLayout();
-        setContent(layout);
-
-        final VerticalLayout contentLayout = new VerticalLayout();
-
-        Button button = new Button("Toggle");
-        button.setId("toggle");
-        button.addClickListener(new ClickListener() {
-            @Override
-            public void buttonClick(ClickEvent event) {
-                contentLayout.removeAllComponents();
-                if (state) {
-                    contentLayout.addComponent(component1);
-                } else {
-                    contentLayout.addComponent(component2);
-                }
-                state = !state;
-            }
-
-        });
-
-        layout.addComponent(button);
-        layout.addComponent(contentLayout);
-
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
-     */
-    @Override
-    protected String getTestDescription() {
-        return "IE8 leaks memory when components are added and removed";
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
-     */
-    @Override
-    protected Integer getTicketNumber() {
-        return 12688;
-    }
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
index 26f54f3ee5..58a66f37b8 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Sliders.java
@@ -71,7 +71,7 @@ public class Sliders extends VerticalLayout implements View {
         slider.addStyleName(ValoTheme.SLIDER_NO_INDICATOR);
         row.addComponent(slider);
 
-        slider = new Slider("With ticks (not in IE8 & IE9)");
+        slider = new Slider("With ticks");
         slider.setValue(3.0);
         slider.setWidth("200px");
         slider.setMax(4);
diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
index 95c6509f9a..2663c7d07f 100644
--- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -179,12 +179,8 @@ public class ValoThemeUI extends UI {
         // disable it to have consistent screenshots
         // https://github.com/ariya/phantomjs/issues/10592
 
-        // IE8 also has randomness in its font rendering...
-
         return getPage().getWebBrowser().getBrowserApplication()
-                .contains("PhantomJS")
-                || (getPage().getWebBrowser().isIE() && getPage()
-                        .getWebBrowser().getBrowserMajorVersion() <= 9);
+                .contains("PhantomJS");
     }
 
     static boolean isTestMode() {
diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
deleted file mode 100644
index a302e47f34..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LayoutMemoryUsageIE8ExtensionConnector.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.widgetset.client;
-
-import com.vaadin.client.BrowserInfo;
-import com.vaadin.client.LayoutManager;
-import com.vaadin.client.LayoutManagerIE8;
-import com.vaadin.client.ServerConnector;
-import com.vaadin.client.extensions.AbstractExtensionConnector;
-import com.vaadin.shared.ui.Connect;
-import com.vaadin.tests.extensions.LayoutMemoryUsageIE8Extension;
-
-@Connect(LayoutMemoryUsageIE8Extension.class)
-public class LayoutMemoryUsageIE8ExtensionConnector
-        extends AbstractExtensionConnector {
-
-    @Override
-    protected void extend(ServerConnector target) {
-        if (BrowserInfo.get().isIE8()) {
-            LayoutManagerIE8 manager = (LayoutManagerIE8) LayoutManager
-                    .get(getConnection());
-            configureGetMapSizeJS(manager);
-        }
-    }
-
-    private native void configureGetMapSizeJS(LayoutManagerIE8 manager)
-    /*-{
-        $wnd.vaadin.getMeasuredSizesCount = function() {
-            return manager.@com.vaadin.client.LayoutManagerIE8::getMeasuredSizesMapSize()();
-        };
-    }-*/;
-}
diff --git a/uitest/src/main/resources/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js b/uitest/src/main/resources/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js
index e3061bf12f..475b453dcc 100644
--- a/uitest/src/main/resources/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js
+++ b/uitest/src/main/resources/com/vaadin/tests/components/grid/JavaScriptStringRenderer.js
@@ -1,7 +1,5 @@
 com_vaadin_tests_components_grid_JavaScriptStringRenderer = function() {
 	this.render = function(cell, data) {
 		cell.element.textContent = data;
-		// This one is for IE8
-		cell.element.innerText = data;
 	}
 }
\ No newline at end of file
diff --git a/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
index f11cdb8b64..0240bf1ed2 100644
--- a/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
+++ b/uitest/src/main/themes/VAADIN/themes/tests-valo-metro/_variables.scss
@@ -16,7 +16,6 @@ $v-textfield-shadow: false;
 $v-textfield-border: 1px solid v-shade;
 $v-link-text-decoration: none;
 $v-overlay-shadow: 0 0 0 2px #000;
-$v-overlay-border-width: 2px; // For IE8
 $v-window-shadow: $v-overlay-shadow;
 $v-selection-overlay-background-color: #fff;
 $v-selection-overlay-padding-horizontal: 0;
diff --git a/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
index bb697151bc..b703a3b2a5 100644
--- a/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/CurrentTimeMillisTest.java
@@ -41,9 +41,7 @@ public class CurrentTimeMillisTest extends MultiBrowserTest {
         openTestURL();
 
         boolean highResTimeSupported = !BrowserUtil
-                .isIE8(getDesiredCapabilities())
-                && !BrowserUtil.isIE(getDesiredCapabilities(), 9)
-                && !BrowserUtil.isPhantomJS(getDesiredCapabilities())
+                .isPhantomJS(getDesiredCapabilities())
                 && !BrowserUtil.isSafari(getDesiredCapabilities());
 
         String time = getJsonParsingTime();
diff --git a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
index 7d5c8e5a2d..c760e941c1 100644
--- a/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -54,13 +54,8 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
 
     private String getExpectedUserAgentString(DesiredCapabilities dCap) {
         if (BrowserUtil.isIE(dCap)) {
-            if (!BrowserUtil.isIE(dCap, 11)) {
-                // IE8-10
-                return "MSIE ";
-            } else {
-                // IE11
-                return "Trident/7.0; rv:";
-            }
+            // IE11
+            return "Trident/7.0; rv:";
         } else if (BrowserUtil.isFirefox(dCap)) {
             return "Firefox/";
         } else if (BrowserUtil.isChrome(dCap)) {
diff --git a/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
index 1231b0036e..a1b36d0b0e 100644
--- a/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/actions/ActionsOnInvisibleComponentsTest.java
@@ -16,8 +16,7 @@ public class ActionsOnInvisibleComponentsTest extends MultiBrowserTest {
     // This method should be removed once #12785 is fixed
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowserCapabilities(Browser.IE9, Browser.IE10, Browser.IE11,
-                Browser.PHANTOMJS);
+        return getBrowserCapabilities(Browser.IE11, Browser.PHANTOMJS);
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
index 82c4413d4a..49dabf467c 100644
--- a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogThemeTest.java
@@ -31,7 +31,6 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.CustomTestBenchCommandExecutor;
 import com.vaadin.tests.tb3.MultiBrowserThemeTestWithProxy;
@@ -74,8 +73,7 @@ public class ReconnectDialogThemeTest extends MultiBrowserThemeTestWithProxy {
                 .read(new ByteArrayInputStream(((TakesScreenshot) getDriver())
                         .getScreenshotAs(OutputType.BYTES)));
         BufferedImage spinnerImage = CustomTestBenchCommandExecutor
-                .cropToElement(spinner, fullScreen,
-                        BrowserUtil.isIE8(getDesiredCapabilities()));
+                .cropToElement(spinner, fullScreen);
         assertHasManyColors("Spinner is not shown", spinnerImage);
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
index 07bf56f2ee..cfe82b8229 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/AbstractOrderedLayoutWithCaptionsTest.java
@@ -25,7 +25,6 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
@@ -52,10 +51,6 @@ public class AbstractOrderedLayoutWithCaptionsTest extends MultiBrowserTest {
         Integer neededHeight = children.get(0).getSize().getHeight()
                 + children.get(2).getSize().getHeight();
 
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // IE8 Reports the first element height incorrectly.
-            --neededHeight;
-        }
         assertThat(neededHeight, is(lessThanOrEqualTo(paddingHeight)));
 
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
index 309e038244..840af1e1e7 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/abstractembedded/EmbeddedWithNullSourceTest.java
@@ -31,8 +31,7 @@ public class EmbeddedWithNullSourceTest extends MultiBrowserTest {
     public List<DesiredCapabilities> getBrowsersToTest() {
         // No Flash on PhantomJS, IE 11 has a timeout issue, looks like a
         // IEDriver problem, not reproduced running locally.
-        return getBrowserCapabilities(Browser.IE8, Browser.IE9, Browser.IE10,
-                Browser.CHROME, Browser.FIREFOX);
+        return getBrowserCapabilities(Browser.CHROME, Browser.FIREFOX);
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java
index e60391dfe1..3a6b8a9c25 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/accordion/AccordionClipsContentTest.java
@@ -35,11 +35,6 @@ public class AccordionClipsContentTest extends MultiBrowserTest {
 
         $(NativeButtonElement.class).first().click();
 
-        // Give the button time to pop back up in IE8.
-        // If this sleep causes issues, next best thing is to click outside the
-        // button to remove focus - needs new screenshots for all browsers.
-        Thread.sleep(10);
-
         compareScreen("button-clicked");
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
index 9134f34684..11464ac7bb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/calendar/SetFirstVisibleHourOfDayTest.java
@@ -20,10 +20,8 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.StaleElementReferenceException;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
@@ -88,17 +86,6 @@ public class SetFirstVisibleHourOfDayTest extends MultiBrowserTest {
         for (WebElement webElement : elements) {
             if (webElement.getText().equals(text)) {
                 webElement.click();
-                if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-                    try {
-                        // sometimes the element only gets focus from click and
-                        // we need to click the text, which is in the right edge
-                        // of the element
-                        testBenchElement(webElement)
-                                .click(webElement.getSize().getWidth() - 5, 9);
-                    } catch (StaleElementReferenceException e) {
-                        // the first click succeeded after all
-                    }
-                }
                 found = true;
                 break;
             }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
deleted file mode 100644
index aeb72e08ed..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxPageLengthZeroScrollTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.combobox;
-
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.testbench.parallel.Browser;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-/**
- * Test class for testing issue #13488 - changing pages with pagelength=0 breaks
- * the style.
- *
- * @author Vaadin Ltd
- */
-
-public class ComboboxPageLengthZeroScrollTest extends MultiBrowserTest {
-    @Test
-    public void testComboboxPageLength() {
-        openTestURL();
-
-        WebElement comboBox = vaadinElement(
-                "/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VFilterSelect[0]#textbox");
-
-        // navigate to the next page. keyboard navigation is the preferred
-        // method here since it's much easier to implement.
-
-        Actions keyNavigation = new Actions(driver).moveToElement(comboBox)
-                .click();
-
-        for (int i = 0; i < 25; ++i) {
-            keyNavigation.sendKeys(Keys.ARROW_DOWN);
-
-        }
-        keyNavigation.perform();
-
-        // The broken behavior always caused a v-shadow element to have
-        // height: 10px. Verify that this does no longer happen.
-
-        String cssValue = driver.findElement(By.className("v-shadow"))
-                .getCssValue("height");
-
-        Assert.assertNotEquals("v-shadow height should not be 10px", "10px",
-                cssValue);
-
-    }
-
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowserCapabilities(Browser.IE8);
-    }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
index 7897c2ab0a..ca87aaa379 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/datefield/PopupDateFieldExtendedRangeTest.java
@@ -343,8 +343,7 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
         new Actions(driver).keyUp(Keys.SHIFT).perform();
 
         // TODO: remove this once #14406 has been fixed
-        if (BrowserUtil.isIE(getDesiredCapabilities())
-                && !BrowserUtil.isIE8(getDesiredCapabilities())) {
+        if (BrowserUtil.isIE(getDesiredCapabilities())) {
             popup.findElement(
                     By.className("v-datefield-calendarpanel-prevmonth"))
                     .findElement(By.tagName("button")).click();
@@ -367,8 +366,7 @@ public class PopupDateFieldExtendedRangeTest extends MultiBrowserTest {
                         .size());
         // TODO: remove this check once #14406 has been fixed -- clicking the
         // button instead of navigating with arrow keys steals the focus
-        if (!BrowserUtil.isIE(getDesiredCapabilities())
-                || BrowserUtil.isIE8(getDesiredCapabilities())) {
+        if (!BrowserUtil.isIE(getDesiredCapabilities())) {
             assertEquals("unexpected focus", "16",
                     popup.findElement(By
                             .className("v-datefield-calendarpanel-day-focused"))
diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
index 1de7f05ef3..64ab631655 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedClickListenerRelativeCoordinatesTest.java
@@ -48,12 +48,6 @@ public class EmbeddedClickListenerRelativeCoordinatesTest
     private void clickAt(int x, int y) {
         EmbeddedElement embedded = $(EmbeddedElement.class).first();
 
-        // IE8 consistently clicks two pixels left and above of the given
-        // position
-        if (isIE8()) {
-            x += 2;
-            y += 2;
-        }
         embedded.click(x, y);
     }
 
@@ -79,8 +73,4 @@ public class EmbeddedClickListenerRelativeCoordinatesTest
         return BrowserUtil.isIE(getDesiredCapabilities());
     }
 
-    private boolean isIE8() {
-        return BrowserUtil.isIE8(getDesiredCapabilities());
-    }
-
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
index 137c2b0a56..fb0a1cf4d5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridClientRenderers.java
@@ -34,7 +34,6 @@ import com.vaadin.testbench.elements.LabelElement;
 import com.vaadin.testbench.elements.NativeButtonElement;
 import com.vaadin.testbench.elements.NativeSelectElement;
 import com.vaadin.testbench.elementsbase.ServerClass;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererConnector.Renderers;
@@ -150,11 +149,6 @@ public class GridClientRenderers extends MultiBrowserTest {
 
         // Simulate network latency with 2000ms
         latency = 2000;
-        if (BrowserUtil.isIE8(desiredCapabilities)) {
-            // IE8 is slower than other browsers. Bigger latency is needed for
-            // stability in this test.
-            latency = 3000;
-        }
 
         // Chrome uses RGB instead of RGBA
         String colorRed = "rgba(255, 0, 0, 1)";
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
index 3288be1aa3..d8b676ea31 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpandTest.java
@@ -42,9 +42,6 @@ public class GridDetailsLayoutExpandTest extends MultiBrowserTest {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
         List<DesiredCapabilities> browsersToTest = super.getBrowsersToTest();
-        // TODO: remove when #19326 is fixed
-        browsersToTest.remove(Browser.IE8.getDesiredCapabilities());
-        browsersToTest.remove(Browser.IE9.getDesiredCapabilities());
         // for some reason PhantomJS doesn't find the label even if it detects
         // the presence
         browsersToTest.remove(Browser.PHANTOMJS.getDesiredCapabilities());
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
index 6b7e56c79c..eaeb8bfddb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridDetailsLocationTest.java
@@ -34,7 +34,6 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.GridElement.GridRowElement;
 import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.components.grid.basicfeatures.element.CustomGridElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -44,7 +43,6 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
 
     private static final int detailsDefaultHeight = 51;
     private static final int detailsDefinedHeight = 33;
-    private static final int detailsDefinedHeightIE8 = 31;
 
     private static class Param {
         private final int rowIndex;
@@ -141,24 +139,19 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
         useGenerator(true);
         toggleAndScroll(5);
 
-        verifyDetailsRowHeight(5, getDefinedHeight(), 0);
+        verifyDetailsRowHeight(5, detailsDefinedHeight, 0);
         verifyDetailsDecoratorLocation(5, 0, 0);
 
         toggleAndScroll(0);
 
-        verifyDetailsRowHeight(0, getDefinedHeight(), 0);
+        verifyDetailsRowHeight(0, detailsDefinedHeight, 0);
         // decorator elements are in DOM in the order they have been added
         verifyDetailsDecoratorLocation(0, 0, 1);
 
-        verifyDetailsRowHeight(5, getDefinedHeight(), 1);
+        verifyDetailsRowHeight(5, detailsDefinedHeight, 1);
         verifyDetailsDecoratorLocation(5, 1, 0);
     }
 
-    private int getDefinedHeight() {
-        boolean ie8 = isIE8();
-        return ie8 ? detailsDefinedHeightIE8 : detailsDefinedHeight;
-    }
-
     private void verifyDetailsRowHeight(int rowIndex, int expectedHeight,
             int visibleIndexOfSpacer) {
         waitForDetailsVisible();
@@ -174,11 +167,6 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                 visibleIndexOfDeco);
         GridRowElement rowElement = getGrid().getRow(row);
 
-        int diff = 0;
-        if (isIE8() || BrowserUtil.isIE(getDesiredCapabilities(), 9)) {
-            diff = 1;
-        }
-
         Assert.assertEquals(
                 "Details deco top position does not match row top pos",
                 rowElement.getLocation().getY(),
@@ -188,7 +176,7 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                 detailsElement.getLocation().getY()
                         + detailsElement.getSize().getHeight(),
                 detailsDecoElement.getLocation().getY()
-                        + detailsDecoElement.getSize().getHeight() + diff);
+                        + detailsDecoElement.getSize().getHeight());
     }
 
     private void verifyLocation(Param param) {
@@ -218,7 +206,7 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
                 detailsBottom, bottomBoundary);
 
         verifyDetailsRowHeight(param.getRowIndex(), param.useGenerator()
-                ? getDefinedHeight() : detailsDefaultHeight, 0);
+                ? detailsDefinedHeight : detailsDefaultHeight, 0);
         verifyDetailsDecoratorLocation(param.getRowIndex(), 0, 0);
 
         Assert.assertFalse("Notification was present",
@@ -278,10 +266,6 @@ public class GridDetailsLocationTest extends MultiBrowserTest {
         }
     }
 
-    private boolean isIE8() {
-        return BrowserUtil.isIE8(getDesiredCapabilities());
-    }
-
     @SuppressWarnings("boxing")
     private boolean isCheckedValo(CheckBoxElement checkBoxElement) {
         WebElement checkbox = checkBoxElement.findElement(By.tagName("input"));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
index fd039b51f0..812e3e0c05 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridHeightTest.java
@@ -26,11 +26,9 @@ import java.util.Map.Entry;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.GridElement;
 import com.vaadin.testbench.elements.OptionGroupElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
@@ -58,14 +56,6 @@ public class GridHeightTest extends MultiBrowserTest {
 
     @Test
     public void testGridHeightAndResizingRow() throws InterruptedException {
-        if (isIE8orIE9()) {
-            /*
-             * with IE8 and IE9 and this height mode grid resizes when it
-             * shouldn't and doesn't resize when it should, pre-existing problem
-             * that isn't within the scope of this ticket
-             */
-            return;
-        }
         assertNoErrors(testGridHeightAndResizing(GridHeight.ROW3));
     }
 
@@ -168,13 +158,7 @@ public class GridHeightTest extends MultiBrowserTest {
             if (GridHeight.PX100.equals(detailsRowHeight)) {
                 result = 182;
             } else if (GridHeight.FULL.equals(detailsRowHeight)) {
-                if (isIE8orIE9()) {
-                    // pre-existing bug in IE8 & IE9, details row doesn't layout
-                    // itself properly
-                    result = 100;
-                } else {
-                    result = 131;
-                }
+                result = 131;
             } else if (GridHeight.UNDEFINED.equals(detailsRowHeight)) {
                 result = 100;
             }
@@ -185,12 +169,6 @@ public class GridHeightTest extends MultiBrowserTest {
         return result;
     }
 
-    private boolean isIE8orIE9() {
-        DesiredCapabilities desiredCapabilities = getDesiredCapabilities();
-        return BrowserUtil.isIE8(desiredCapabilities)
-                || BrowserUtil.isIE(desiredCapabilities, 9);
-    }
-
     private void assertGridHeight(int expected, int actual) {
         assertThat("Unexpected Grid Height", (double) actual,
                 closeTo(expected, 1));
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
index 7b7cb5c3f6..ee9aa15b5c 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridSidebarPositionTest.java
@@ -25,7 +25,6 @@ import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;

 

 import com.vaadin.testbench.elements.GridElement;

-import com.vaadin.testbench.parallel.BrowserUtil;

 import com.vaadin.tests.tb3.MultiBrowserTest;

 

 public class GridSidebarPositionTest extends MultiBrowserTest {

@@ -69,14 +68,7 @@ public class GridSidebarPositionTest extends MultiBrowserTest {
         Dimension popupSize = sidebarPopup.getSize();

         Point popupLocation = sidebarPopup.getLocation();

         int popupBottom = popupLocation.getY() + popupSize.getHeight();

-        int sideBarButtonTop;

-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {

-            // IE8 gets the top coordinate for the button completely wrong for

-            // some reason

-            sideBarButtonTop = 660;

-        } else {

-            sideBarButtonTop = sidebarOpenButton.getLocation().getY();

-        }

+        int sideBarButtonTop = sidebarOpenButton.getLocation().getY();

         Assert.assertTrue(popupBottom <= sideBarButtonTop);

     }

 

diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
index c264d9ab3d..eb2ee1c9db 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/GridThemeUITest.java
@@ -78,10 +78,6 @@ public class GridThemeUITest extends MultiBrowserThemeTest {
         TextFieldElement age = editor.$(TextFieldElement.class).caption("Age")

                 .first();

         age.sendKeys("abc", Keys.TAB);

-        if (age.getValue().equals("21")) {

-            // Yes IE8, really type into the field

-            age.sendKeys("abc", Keys.TAB);

-        }

         editor.save();

 

         compareScreen("two-invalid");

diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
index 46eebe22d3..fee503f6dc 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorClientTest.java
@@ -282,10 +282,7 @@ public class GridEditorClientTest extends GridBasicClientFeaturesTest {
 
         WebElement focused = getFocusedElement();
 
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            assertEquals("Focus should be in html", "html",
-                    focused.getTagName());
-        } else if (BrowserUtil.isIE(getDesiredCapabilities())) {
+        if (BrowserUtil.isIE(getDesiredCapabilities())) {
             assertEquals("Focus should be nowhere", null, focused);
         } else {
             // GWT menubar loses focus after clicking a menuitem
diff --git a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
index c009c51837..fc708db5c4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorUnbufferedTest.java
@@ -28,7 +28,6 @@ import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.GridElement.GridCellElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 
 public class GridEditorUnbufferedTest extends GridEditorTest {
 
@@ -92,10 +91,6 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
         getEditorWidgets().get(0).click();
         new Actions(getDriver()).sendKeys(Keys.ENTER).perform();
 
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            sleep(300);
-        }
-
         String firstFieldValue = getEditorWidgets().get(0)
                 .getAttribute("value");
         assertEquals("Editor should move to row 101", "(101, 0)",
@@ -105,10 +100,6 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
             new Actions(getDriver()).keyDown(Keys.SHIFT).sendKeys(Keys.ENTER)
                     .keyUp(Keys.SHIFT).perform();
 
-            if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-                sleep(300);
-            }
-
             firstFieldValue = getEditorWidgets().get(0).getAttribute("value");
             int row = 100 - i;
             assertEquals("Editor should move to row " + row, "(" + row + ", 0)",
@@ -137,9 +128,6 @@ public class GridEditorUnbufferedTest extends GridEditorTest {
                 getEditorWidgets().get(0).getAttribute("value"));
 
         getEditorWidgets().get(1).sendKeys(Keys.chord(Keys.CONTROL, "a"));
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            sleep(1500);
-        }
         getEditorWidgets().get(1).sendKeys("5");
         // FIXME: Needs to trigger one extra validation round-trip for now
         getGridElement().sendKeys(Keys.ENTER);
diff --git a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
index 9626e9d537..7aa5575696 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponentTest.java
@@ -7,7 +7,6 @@ import org.openqa.selenium.By;
 import com.vaadin.testbench.elements.AbstractComponentElement;
 import com.vaadin.testbench.elements.AbstractJavaScriptComponentElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class BasicJavaScriptComponentTest extends MultiBrowserTest {
@@ -24,9 +23,6 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest {
 
         // Data types in JS functions
         String expected = "1970-01-01T00:00:00.111Z";
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            expected = "1970-01-01T00:00:00Z";
-        }
         Assert.assertEquals(
                 "9. Argument[4][aDate] type: elemental.json.impl.JreJsonString, value: "
                         + expected,
@@ -54,9 +50,6 @@ public class BasicJavaScriptComponentTest extends MultiBrowserTest {
                 getLogRow(idx++));
 
         expected = "1970-01-01T00:00:00.123Z";
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            expected = "1970-01-01T00:00:00Z";
-        }
 
         Assert.assertEquals(
                 "1. Argument[0] type: elemental.json.impl.JreJsonString, value: "
diff --git a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
index bf5125187f..0d184bd3cb 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/menubar/MenuBarTooltipsNearEdgeTest.java
@@ -19,15 +19,12 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.lessThan;
 import static org.junit.Assert.assertThat;
 
-import java.util.List;
-
 import org.junit.Test;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.HasInputDevices;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.internal.Coordinates;
 import org.openqa.selenium.internal.Locatable;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.MenuBarElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -39,12 +36,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  */
 public class MenuBarTooltipsNearEdgeTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        // Tooltip test is unreliable on IE8
-        return getBrowsersExcludingIE8();
-    };
-
     @Test
     public void testTooltipLocation() {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
index ff37cf7e60..af727d8bd3 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/CaptionLeakTest.java
@@ -19,7 +19,6 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class CaptionLeakTest extends MultiBrowserTest {
@@ -29,7 +28,7 @@ public class CaptionLeakTest extends MultiBrowserTest {
         setDebug(true);
         openTestURL();
 
-        openLog();
+        openDebugLogTab();
 
         // this should be present
         // 3 general non-connector elements, none accumulated on click
@@ -53,7 +52,7 @@ public class CaptionLeakTest extends MultiBrowserTest {
         setDebug(true);
         openTestURL();
 
-        openLog();
+        openDebugLogTab();
 
         clearLog();
         $(ButtonElement.class).caption("Set non leaky content").first().click();
@@ -62,13 +61,6 @@ public class CaptionLeakTest extends MultiBrowserTest {
         checkConnectorCount();
     }
 
-    private void openLog() {
-        openDebugLogTab();
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            openDebugLogTab();
-        }
-    }
-
     private void clearLog() {
         getDriver().findElement(By.xpath("//button[@title = 'Clear log']"))
                 .click();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
index 001b4e50a2..3617c00c08 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/orderedlayout/VerticalLayoutFocusWithDOMChangesTest.java
@@ -24,7 +24,6 @@ import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.By;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
@@ -55,15 +54,8 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
         Assert.assertEquals("Just a button", activeElement.getText());
 
         DesiredCapabilities capabilities = getDesiredCapabilities();
-        if (BrowserUtil.isIE8(capabilities)
-                || BrowserUtil.isIE(capabilities, 9)) {
-            // IE8 and IE9 insert cursor in the start of input instead of end.
-            Assert.assertEquals(incrementalText + initialText,
-                    tf1.getAttribute("value"));
-        } else {
-            Assert.assertEquals(initialText + incrementalText,
-                    tf1.getAttribute("value"));
-        }
+        Assert.assertEquals(initialText + incrementalText,
+                tf1.getAttribute("value"));
     }
 
     @Test
@@ -87,14 +79,6 @@ public class VerticalLayoutFocusWithDOMChangesTest extends MultiBrowserTest {
 
         new Actions(getDriver()).sendKeys(secondText).build().perform();
         DesiredCapabilities capabilities = getDesiredCapabilities();
-        if (BrowserUtil.isIE8(capabilities)
-                || BrowserUtil.isIE(capabilities, 9)) {
-            // IE8 and IE9 insert cursor in the start of input instead of end.
-            Assert.assertEquals(secondText + firstText,
-                    tf2.getAttribute("value"));
-        } else {
-            Assert.assertEquals(firstText + secondText,
-                    tf2.getAttribute("value"));
-        }
+        Assert.assertEquals(firstText + secondText, tf2.getAttribute("value"));
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java
index 34f623360a..756a55f3c5 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/panel/PanelRemoveShortcutListenerTest.java
@@ -55,7 +55,6 @@ public class PanelRemoveShortcutListenerTest extends MultiBrowserTest {
         List<DesiredCapabilities> list = super.getBrowsersToTest();
         // For some reason the shortcut isn't working for these browsers when
         // tested through TestBench:
-        list.remove(Browser.IE8.getDesiredCapabilities());
         list.remove(Browser.FIREFOX.getDesiredCapabilities());
         list.remove(Browser.CHROME.getDesiredCapabilities());
         return list;
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
deleted file mode 100644
index f29e07b563..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewResizeWhileOpenTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.components.popupview;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.greaterThan;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.lessThan;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.Dimension;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.PopupViewElement;
-import com.vaadin.testbench.elements.VerticalLayoutElement;
-import com.vaadin.testbench.parallel.Browser;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-/**
- * Resizing PopupView's popup component while it is visible should also resize
- * the drop shadow of the overlay.
- *
- * @author Vaadin Ltd
- */
-public class PopupViewResizeWhileOpenTest extends MultiBrowserTest {
-
-    @Test
-    public void testCustomPopupSizeAfterResize() {
-        openTestURL();
-
-        // Open PopupView
-        $(PopupViewElement.class).first().click();
-
-        // Sanity check
-        assertShadowSize();
-
-        // Resize
-        $(ButtonElement.class).first().click();
-        assertShadowSize();
-    }
-
-    private void assertShadowSize() {
-        Dimension shadowSize = getPopupShadow().getSize();
-        Dimension layoutSize = $(VerticalLayoutElement.class).id("content-vl")
-                .getSize();
-
-        assertThat(shadowSize.height, is(greaterThan(layoutSize.height)));
-        assertThat(shadowSize.height, is(lessThan(layoutSize.height + 10)));
-        assertThat(shadowSize.width, is(greaterThan(layoutSize.width)));
-        assertThat(shadowSize.width, is(lessThan(layoutSize.width + 10)));
-    }
-
-    private WebElement getPopupShadow() {
-        // Shadows with index 0: tooltip, index 1: popup
-        return findElements(By.className("v-shadow")).get(1);
-    }
-
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowserCapabilities(Browser.IE8);
-    }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
index 903ba221c5..63a0d71caa 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/popupview/PopupViewShortcutActionHandlerTest.java
@@ -21,7 +21,6 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
@@ -33,9 +32,6 @@ public class PopupViewShortcutActionHandlerTest extends MultiBrowserTest {
 
     @Override
     protected boolean requireWindowFocusForIE() {
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            return false;
-        }
         return true;
     }
 
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 1215e24ac3..e9e9d51578 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
@@ -24,7 +24,6 @@ import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.TestBenchElement;
 import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.components.table.CustomTableElement.ContextMenuElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
@@ -47,18 +46,10 @@ public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {
         compareScreen(table, "col3");
 
         // Show column 2 using context menu (first action)
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // IE8 can context click but the popup is off screen so it can't be
-            // interacted with...
-            ButtonElement show2 = $(ButtonElement.class).caption("Show Col2")
-                    .first();
-            show2.click();
-        } else {
-            contextClick(table.getCell(0, 0));
-            ContextMenuElement contextMenu = table.getContextMenu();
-            WebElement i = contextMenu.getItem(0);
-            i.click();
-        }
+        contextClick(table.getCell(0, 0));
+        ContextMenuElement contextMenu = table.getContextMenu();
+        WebElement i = contextMenu.getItem(0);
+        i.click();
         compareScreen(table, "col2-col3");
 
         // Show column 1 again
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
index eea1aa5d8c..e12e72d7d6 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/FooterTest.java
@@ -29,7 +29,6 @@ import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.testbench.elements.CheckBoxElement;
 import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.testbench.elements.TextFieldElement;
-import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 /**
@@ -61,17 +60,11 @@ public class FooterTest extends MultiBrowserTest {
         CheckBoxElement checkBox = $(CheckBoxElement.class).first();
         checkBox.click();
 
-        if (!BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // excluded IE8 since its screenshots varies from run-to-run
-            compareScreen("no-footer");
-        }
+        compareScreen("no-footer");
 
         checkBox.click();
 
-        if (!BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // excluded IE8 since its screenshots varies from run-to-run
-            compareScreen("footer-col1-col2-col3-a");
-        }
+        compareScreen("footer-col1-col2-col3-a");
 
         table = $(TableElement.class).first();
 
@@ -88,20 +81,14 @@ public class FooterTest extends MultiBrowserTest {
         // hide col2
         findElements(By.className("gwt-MenuItem")).get(1).click();
 
-        if (!BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // excluded IE8 since its screenshots varies from run-to-run
-            compareScreen("footer-col1-col3");
-        }
+        compareScreen("footer-col1-col3");
 
         // open table column selector menu
         table.findElement(By.className("v-table-column-selector")).click();
         // show col2
         findElements(By.className("gwt-MenuItem")).get(1).click();
 
-        if (!BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // excluded IE8 since its screenshots varies from run-to-run
-            compareScreen("footer-col1-col2-col3-b");
-        }
+        compareScreen("footer-col1-col2-col3-b");
 
         TextFieldElement tf = $(TextFieldElement.class).first();
         tf.clear();
@@ -167,10 +154,7 @@ public class FooterTest extends MultiBrowserTest {
         footer1 = table.getFooterCell(0);
         assertEquals("Footer1", footer1.getText());
 
-        if (!BrowserUtil.isIE8(getDesiredCapabilities())) {
-            // excluded IE8 since its screenshots varies from run-to-run
-            compareScreen("footer-col1-col2-col3-c");
-        }
+        compareScreen("footer-col1-col2-col3-c");
     }
 
     private void waitUntiltextFieldIsChangedTo(final TextFieldElement tf,
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java
deleted file mode 100644
index 3de2ceb200..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthIE8Test.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.vaadin.tests.components.table;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-
-import org.junit.Test;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.testbench.elements.ButtonElement;
-import com.vaadin.testbench.elements.TableElement;
-import com.vaadin.testbench.parallel.Browser;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-public class TableColumnResizeContentsWidthIE8Test extends MultiBrowserTest {
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowserCapabilities(Browser.IE8);
-    }
-
-    @Override
-    protected Class<?> getUIClass() {
-        return TableColumnResizeContentsWidth.class;
-    }
-
-    @Test
-    public void testResizing() throws InterruptedException {
-        openTestURL();
-
-        TableElement table = $(TableElement.class).first();
-        List<ButtonElement> buttons = $(ButtonElement.class).all();
-
-        WebElement textField = table.findElement(By.className("v-textfield"));
-
-        // click the button for decreasing size
-        buttons.get(1).click();
-
-        assertEquals(60, textField.getSize().width);
-
-        // click the button for increasing size
-        buttons.get(0).click();
-
-        assertEquals(80, textField.getSize().width);
-    }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
index c989e8430b..5403e8aff4 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableColumnResizeContentsWidthTest.java
@@ -24,7 +24,6 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 
 import com.vaadin.testbench.elements.ButtonElement;
@@ -39,11 +38,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  */
 public class TableColumnResizeContentsWidthTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowsersExcludingIE8();
-    }
-
     @Test
     public void testResizing() throws InterruptedException {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
index 9fc286c245..091c9866ae 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/table/TableWithPollingTest.java
@@ -15,14 +15,11 @@
  */
 package com.vaadin.tests.components.table;
 
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.TableElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -83,11 +80,4 @@ public class TableWithPollingTest extends MultiBrowserTest {
         Assert.assertEquals(width, getBodyCell(column).getSize().width);
     }
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        // Selenium has issues with drag-and-drop on IE8 making it impossible to
-        // drag a target as small as the table resizer. So we'll just have to
-        // ignore IE8 completely.
-        return getBrowsersExcludingIE8();
-    }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
index a1f812d0f4..08b52edf1e 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
@@ -46,8 +46,8 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
         // Ignoring Chrome 40 because of a regression. See #16636.
-        return getBrowserCapabilities(Browser.IE8, Browser.IE9, Browser.IE10,
-                Browser.IE11, Browser.FIREFOX, Browser.PHANTOMJS);
+        return getBrowserCapabilities(Browser.IE11, Browser.FIREFOX,
+                Browser.PHANTOMJS);
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
index 062215ccad..2786e52849 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/TextAreaEventPropagationModifierKeysTest.java
@@ -69,8 +69,8 @@ public class TextAreaEventPropagationModifierKeysTest extends MultiBrowserTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        // IE8 and Firefox can't handle ctrl.
-        // IE9-11 has issues with shift and ctrl
+        // Firefox can't handle ctrl.
+        // IE11 has issues with shift and ctrl
         return getBrowserCapabilities(Browser.CHROME, Browser.PHANTOMJS);
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
index aa4d788dcd..716a28fa8f 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIPollingTest.java
@@ -1,23 +1,13 @@
 package com.vaadin.tests.components.ui;
 
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.tests.legacyelements.LegacyTextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class UIPollingTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        // Manually testing IE8 stops polling with -1, but with automated test
-        // it seems to be highly unpredictable.
-        return super.getBrowsersExcludingIE8();
-    }
-
     @Test
     public void testPolling() throws Exception {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
index 44a5ac2a45..dae3267d70 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/SubWindowsTextSelectionTest.java
@@ -38,11 +38,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  */
 public class SubWindowsTextSelectionTest extends MultiBrowserTest {
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.tests.tb3.AbstractTB3Test#getUIClass()
-     */
     @Override
     protected Class<?> getUIClass() {
         return SubWindows.class;
@@ -50,7 +45,7 @@ public class SubWindowsTextSelectionTest extends MultiBrowserTest {
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowserCapabilities(Browser.IE9, Browser.IE10, Browser.IE11);
+        return getBrowserCapabilities(Browser.IE11);
     }
 
     @Test
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
deleted file mode 100644
index 60a865040f..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowBGColorChameleonIE8Test.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.vaadin.tests.components.window;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.Test;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.testbench.parallel.Browser;
-import com.vaadin.tests.tb3.SingleBrowserTest;
-
-public class WindowBGColorChameleonIE8Test extends SingleBrowserTest {
-
-    /*
-     * We care about IE8 here only (Or any very very old browsers)
-     *
-     * @see com.vaadin.tests.tb3.SingleBrowserTest#getBrowsersToTest()
-     */
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return Arrays.asList(Browser.IE8.getDesiredCapabilities());
-    }
-
-    @Test
-    public void testWindowColor() throws IOException {
-        openTestURL();
-        compareScreen("grey-background-window");
-    }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
index 490140bbc3..bff4280589 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/window/WindowShadowTest.java
@@ -17,7 +17,6 @@ package com.vaadin.tests.components.window;
 
 import java.awt.AWTException;
 import java.io.IOException;
-import java.util.List;
 
 import org.junit.Test;
 import org.openqa.selenium.By;
@@ -27,7 +26,6 @@ import org.openqa.selenium.interactions.HasInputDevices;
 import org.openqa.selenium.interactions.Mouse;
 import org.openqa.selenium.interactions.internal.Coordinates;
 import org.openqa.selenium.internal.Locatable;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
@@ -56,10 +54,4 @@ public class WindowShadowTest extends MultiBrowserTest {
         org.junit.Assert.assertNotEquals(startLoc, endLoc);
     }
 
-    // IE8 doesn't support shadow-box css rule
-    // ignore this browser in testing
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowsersExcludingIE8();
-    }
 }
\ No newline at end of file
diff --git a/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
index 96248cc612..9e9d1e969c 100644
--- a/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/debug/PushVersionInfoTest.java
@@ -20,9 +20,7 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
 
 import com.vaadin.testbench.parallel.TestCategory;
 import com.vaadin.tests.tb3.SingleBrowserTest;
@@ -67,25 +65,8 @@ public class PushVersionInfoTest extends SingleBrowserTest {
     }
 
     private void selectInfoTab() {
-        if (isElementPresent(By.className("v-ie8"))) {
-
-            int size = findElements(By.className("v-debugwindow-tab")).size();
-            for (int i = 0; i < size; i++) {
-                WebElement tab = findElement(
-                        By.className("v-debugwindow-tab-selected"));
-                String title = tab.getAttribute("title");
-                if (title != null && title.startsWith("General information")) {
-                    break;
-                }
-                Actions actions = new Actions(getDriver());
-                actions.sendKeys(Keys.TAB);
-                actions.sendKeys(Keys.SPACE);
-                actions.build().perform();
-            }
-        } else {
-            findElements(By.className("v-debugwindow-tab")).get(0).click();
-            findElements(By.className("v-debugwindow-tab")).get(1).click();
-        }
+        findElements(By.className("v-debugwindow-tab")).get(0).click();
+        findElements(By.className("v-debugwindow-tab")).get(1).click();
     }
 
     private WebElement getPushRowValue(String key) {
diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
deleted file mode 100644
index 04aed64e5d..0000000000
--- a/uitest/src/test/java/com/vaadin/tests/layouts/IE8MeasuredSizeMemoryLeakTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.layouts;
-
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.remote.DesiredCapabilities;
-
-import com.vaadin.testbench.parallel.Browser;
-import com.vaadin.tests.tb3.MultiBrowserTest;
-
-public class IE8MeasuredSizeMemoryLeakTest extends MultiBrowserTest {
-
-    @Test
-    public void testMeasuredSizesMapCleaned() {
-        openTestURL();
-        Assert.assertEquals("No extra measured sizes in the beginning", 3,
-                getMeasuredSizesMapSize());
-        vaadinElementById("toggle").click();
-        Assert.assertEquals("Measured sizes after single toggle", 204,
-                getMeasuredSizesMapSize());
-        vaadinElementById("toggle").click();
-        Assert.assertEquals("Measured sizes cleaned on toggle", 204,
-                getMeasuredSizesMapSize());
-    }
-
-    private int getMeasuredSizesMapSize() {
-        JavascriptExecutor jsExec = (JavascriptExecutor) getDriver();
-        Number result = (Number) jsExec
-                .executeScript("return window.vaadin.getMeasuredSizesCount();");
-        return result.intValue();
-    }
-
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowserCapabilities(Browser.IE8);
-    }
-}
diff --git a/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
index 133430841b..16b92139f7 100644
--- a/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
+++ b/uitest/src/test/java/com/vaadin/tests/requesthandlers/UnsupportedBrowserHandlerUserAgents.java
@@ -39,10 +39,10 @@ public class UnsupportedBrowserHandlerUserAgents {
     }
 
     @Test
-    public void ie9Supported() {
+    public void ie9NotSupported() {
         String response = requestWithUserAgent(
                 "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 7.1; Trident/5.0)");
-        Assert.assertFalse("IE9 should be supported",
+        Assert.assertTrue("IE9 should not be supported",
                 response.contains("your browser is not supported"));
     }
 
@@ -50,7 +50,7 @@ public class UnsupportedBrowserHandlerUserAgents {
     public void unknownSupported() {
         String response = requestWithUserAgent(
                 "Very strange user agent, like wat");
-        Assert.assertFalse("Unkonwn user agent should be supported",
+        Assert.assertFalse("Unknown user agent should be supported",
                 response.contains("your browser is not supported"));
     }
 
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
index 8f3a0206f4..1d49799dc4 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/DndActionsTest.java
@@ -19,8 +19,6 @@ import org.junit.Ignore;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 
-import com.vaadin.testbench.parallel.BrowserUtil;
-
 /**
  * Base class for TestBench 3+ tests that use DnD. This class contains utility
  * methods for DnD operations.
@@ -31,42 +29,14 @@ import com.vaadin.testbench.parallel.BrowserUtil;
 public abstract class DndActionsTest extends MultiBrowserTest {
 
     public void dragAndDrop(WebElement element, int xOffset, int yOffset) {
-        /*
-         * Selenium doesn't properly drag and drop items in IE8. It tries to
-         * start dragging an element from a position above the element itself.
-         */
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            Actions action = new Actions(getDriver());
-            action.moveToElement(element);
-            action.moveByOffset(0, 1);
-            action.clickAndHold();
-            action.moveByOffset(xOffset, yOffset);
-            action.release();
-            action.build().perform();
-        } else {
-            Actions action = new Actions(getDriver());
-            action.dragAndDropBy(element, xOffset, yOffset);
-            action.build().perform();
-        }
+        Actions action = new Actions(getDriver());
+        action.dragAndDropBy(element, xOffset, yOffset);
+        action.build().perform();
     }
 
     public void dragAndDrop(WebElement element, WebElement target) {
-        /*
-         * Selenium doesn't properly drag and drop items in IE8. It tries to
-         * start dragging an element from a position above the element itself.
-         */
-        if (BrowserUtil.isIE8(getDesiredCapabilities())) {
-            Actions action = new Actions(getDriver());
-            action.moveToElement(element);
-            action.moveByOffset(0, 1);
-            action.clickAndHold();
-            action.moveToElement(target);
-            action.release();
-            action.build().perform();
-        } else {
-            Actions action = new Actions(getDriver());
-            action.dragAndDrop(element, target);
-            action.build().perform();
-        }
+        Actions action = new Actions(getDriver());
+        action.dragAndDrop(element, target);
+        action.build().perform();
     }
 }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
index b10c51573f..e847b66ac5 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/LegacyComponentThemeChangeTest.java
@@ -72,9 +72,8 @@ public class LegacyComponentThemeChangeTest extends MultiBrowserTest {
     }
 
     private void assertEmbeddedTheme(String theme) {
-        if (BrowserUtil.isIE8(getDesiredCapabilities())
-                || BrowserUtil.isChrome(getDesiredCapabilities())) {
-            // IE8 and Chrome 47 won't initialize the dummy flash properly
+        if (BrowserUtil.isChrome(getDesiredCapabilities())) {
+            // Chrome 47 won't initialize the dummy flash properly
             return;
         }
         EmbeddedElement e = $(EmbeddedElement.class).first();
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
index f261730930..a69b49fc6e 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/base/DisabledMenuBarItemTest.java
@@ -9,7 +9,6 @@ import org.junit.Test;
 import org.openqa.selenium.WebElement;
 
 import com.vaadin.testbench.By;
-import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class DisabledMenuBarItemTest extends MultiBrowserTest {
@@ -21,16 +20,7 @@ public class DisabledMenuBarItemTest extends MultiBrowserTest {
         WebElement element = driver
                 .findElement(By.className("v-menubar-menuitem-disabled"));
 
-        if (Browser.IE9.getDesiredCapabilities()
-                .equals(getDesiredCapabilities())) {
-            assertThat(element.getCssValue("filter"), is("alpha(opacity=50)"));
-        } else if (Browser.IE8.getDesiredCapabilities()
-                .equals(getDesiredCapabilities())) {
-            WebElement icon = element.findElement(By.tagName("img"));
-            assertThat(icon.getCssValue("filter"), is("alpha(opacity=50)"));
-        } else {
-            assertThat(element.getCssValue("opacity"), is("0.5"));
-        }
+        assertThat(element.getCssValue("opacity"), is("0.5"));
 
         compareScreen("transparent");
     }
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java
index 27c3bfa91d..a800d9cdd9 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/GridDisabledTest.java
@@ -1,23 +1,14 @@
 package com.vaadin.tests.themes.valo;
 
 import java.io.IOException;
-import java.util.List;
 
 import org.junit.Test;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.ButtonElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 
 public class GridDisabledTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        // Grids current DOM/CSS structure doesn't allow
-        // opacity to work properly in IE8.
-        return getBrowsersExcludingIE8();
-    }
-
     @Test
     public void disabledGrid() throws IOException {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
index e3b4043625..532d8acde1 100644
--- a/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/themes/valo/TextFieldBevelTest.java
@@ -19,10 +19,7 @@ import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 
-import java.util.List;
-
 import org.junit.Test;
-import org.openqa.selenium.remote.DesiredCapabilities;
 
 import com.vaadin.testbench.elements.TextFieldElement;
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -34,11 +31,6 @@ import com.vaadin.tests.tb3.MultiBrowserTest;
  */
 public class TextFieldBevelTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        return getBrowsersExcludingIE8();
-    }
-
     @Test
     public void bevelChangesBoxShadow() {
         openTestURL();
diff --git a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
index 5f21571f81..7221031882 100644
--- a/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/util/WidgetUtilTest.java
@@ -15,29 +15,18 @@
  */
 package com.vaadin.tests.util;
 
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.remote.DesiredCapabilities;
 
-import com.vaadin.testbench.parallel.Browser;
 import com.vaadin.testbench.parallel.BrowserUtil;
 import com.vaadin.tests.tb3.MultiBrowserTest;
 import com.vaadin.tests.widgetset.server.WidgetUtilUI;
 
 public class WidgetUtilTest extends MultiBrowserTest {
 
-    @Override
-    public List<DesiredCapabilities> getBrowsersToTest() {
-        List<DesiredCapabilities> l = super.getBrowsersToTest();
-        // IE8 does not support getComputedStyle
-        l.remove(Browser.IE8.getDesiredCapabilities());
-        return l;
-    }
-
     @Test
     public void testBlockElementRequiredSizeComputedStyle() {
         openTestURL();