2 files changed, 18 insertions, 14 deletions
diff --git a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java b/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
index 7ab6f01113..933bca8c7d 100644
--- a/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
+++ b/uitest/src/com/vaadin/tests/components/calendar/CalendarNotificationsTestIE.java
@@ -41,24 +41,18 @@ public class CalendarNotificationsTestIE extends MultiBrowserTest {
     }
 
     @Override
-    protected DesiredCapabilities getDesiredCapabilities() {
-        DesiredCapabilities desiredCapabilities = new DesiredCapabilities(
-                super.getDesiredCapabilities());
-        desiredCapabilities.setCapability("enablePersistentHover", false);
-        desiredCapabilities.setCapability("requireWindowFocus", true);
+    protected boolean requireWindowFocusForIE() {
+        return true;
+    }
 
-        return desiredCapabilities;
+    @Override
+    protected boolean usePersistentHoverForIE() {
+        return false;
     }
 
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
-        List<DesiredCapabilities> browsers = super.getBrowsersToTest();
-        browsers.remove(Browser.CHROME.getDesiredCapabilities());
-        browsers.remove(Browser.FIREFOX.getDesiredCapabilities());
-        browsers.remove(Browser.OPERA.getDesiredCapabilities());
-        browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities());
-        browsers.remove(Browser.SAFARI.getDesiredCapabilities());
-        return browsers;
+        return getIEBrowsersOnly();
     }
 
     @Test
@@ -68,7 +62,7 @@ public class CalendarNotificationsTestIE extends MultiBrowserTest {
         WebElement day = findElements(By.className("v-calendar-day-number"))
                 .get(2);
         // IE8 requires you to click on the text part to fire the event
-        new Actions(getDriver()).moveToElement(day, 83, 11).click().perform();
+        new Actions(getDriver()).moveToElement(day, day.getSize().getWidth() - 3, day.getSize().getHeight() / 2).click().perform();
 
         // check that a notification was opened, this is done with a log instead
         // of a screenshot or element presence check due to problems with IE
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
index 414aebbd33..72fb2c18d1 100644
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -58,6 +58,16 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
         browsers.remove(Browser.FIREFOX.getDesiredCapabilities());
         browsers.remove(Browser.PHANTOMJS.getDesiredCapabilities());
 
+		return browsers;
+	}
+
+    protected List<DesiredCapabilities> getIEBrowsersOnly() {
+        List<DesiredCapabilities> browsers = new ArrayList<DesiredCapabilities>();
+        browsers.add(Browser.IE8.getDesiredCapabilities());
+        browsers.add(Browser.IE9.getDesiredCapabilities());
+        browsers.add(Browser.IE10.getDesiredCapabilities());
+        browsers.add(Browser.IE11.getDesiredCapabilities());
+
         return browsers;
     }