Merge commit 'c9eb856'

Conflicts:
	uitest/src/com/vaadin/tests/components/table/SelectAllRowsTest.java

Change-Id: I0b2b253cae1ddba0f17721786019171e1678d7e2

2 files changed, 10 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java b/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
index d54a8b467a..104380c96c 100644
--- a/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
+++ b/uitest/src/com/vaadin/tests/components/table/AddSelectionToRemovedRange.java
@@ -19,7 +19,6 @@ import java.util.Set;
 
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.tests.components.AbstractTestUI;
-import com.vaadin.tests.tb3.AbstractTB3Test.RunLocally;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.Notification.Type;
@@ -34,7 +33,6 @@ import com.vaadin.ui.VerticalLayout;
  * @author Vaadin Ltd
  */
 @SuppressWarnings("serial")
-@RunLocally()
 public class AddSelectionToRemovedRange extends AbstractTestUI {
 
     @Override
diff --git a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java
index 33197613dc..8996e62503 100644
--- a/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java
+++ b/uitest/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplicationTest.java
@@ -24,6 +24,7 @@ import org.junit.Test;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.Select;
 
 import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -32,6 +33,15 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
 
 public class LayoutTesterApplicationTest extends MultiBrowserTest {
+
+    @Override
+    protected DesiredCapabilities getDesiredCapabilities() {
+        DesiredCapabilities cap = new DesiredCapabilities(
+                super.getDesiredCapabilities());
+        cap.setCapability("nativeEvents", false);
+        return cap;
+    }
+
     Map<String, Integer> numberOfSubTests = new HashMap<String, Integer>();
     private Set<String> tableOrIconsTests = new HashSet<String>();