29 files changed, 8 insertions, 133 deletions
diff --git a/pom.xml b/pom.xml
index e1d3a5073f..7436601f90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -585,7 +585,6 @@
                 <module>client-compiler</module>
                 <module>client-compiled</module>
                 <module>themes</module>
-                <module>uitest-common</module>
                 <module>uitest</module>
                 <module>liferay</module>
                 <module>all</module>
diff --git a/test/servlet-containers/generic/ivy.xml b/test/servlet-containers/generic/ivy.xml
index 33ac7c7c04..414f26d71b 100644
--- a/test/servlet-containers/generic/ivy.xml
+++ b/test/servlet-containers/generic/ivy.xml
@@ -27,10 +27,6 @@
 
         <!-- LIBRARY DEPENDENCIES (compile time) -->
         <!-- Project modules -->
-        <dependency org="com.vaadin" name="vaadin-uitest-common"
-            rev="${vaadin.version}" conf="build->default">
-            <exclude type="pom" />
-        </dependency>
         <dependency org="com.vaadin" name="vaadin-server"
             rev="${vaadin.version}" conf="build->default">
             <exclude org="javax.servlet"></exclude>
diff --git a/test/servlet-containers/generic/ivysettings.xml b/test/servlet-containers/generic/ivysettings.xml
index f28250c3c1..e807d3d36e 100644
--- a/test/servlet-containers/generic/ivysettings.xml
+++ b/test/servlet-containers/generic/ivysettings.xml
@@ -69,8 +69,6 @@
             resolver="vaadin-maven" />
         <module organisation="com.vaadin" name="vaadin-liferay"
             resolver="vaadin-maven" />
-        <module organisation="com.vaadin" name="vaadin-uitest-common"
-            resolver="vaadin-maven" />
     </modules>
 
 
diff --git a/test/servlet-containers/jsp-integration/pom.xml b/test/servlet-containers/jsp-integration/pom.xml
index c32914c3c0..5bb5fd9959 100644
--- a/test/servlet-containers/jsp-integration/pom.xml
+++ b/test/servlet-containers/jsp-integration/pom.xml
@@ -19,12 +19,6 @@
             <artifactId>vaadin-client-compiled</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-uitest-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml
deleted file mode 100644
index f87ece9f3a..0000000000
--- a/uitest-common/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.vaadin</groupId>
-        <artifactId>vaadin-root</artifactId>
-        <version>8.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>vaadin-uitest-common</artifactId>
-    <name>vaadin-uitest-common</name>
-    <packaging>jar</packaging>
-    <properties>
-        <skip.uitest.deployment>true</skip.uitest.deployment>
-        <!-- Don't care about coding style for tests -->
-        <sonar.skip>true</sonar.skip>
-    </properties>
-
-    <url>https://vaadin.com/</url>
-    <description>Vaadin UI test common classes and dependencies</description>
-
-    <repositories>
-        <repository>
-            <id>vaadin-addons</id>
-            <url>http://maven.vaadin.com/vaadin-addons</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <!-- LIBRARY DEPENDENCIES (compile time) -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-server</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>vaadin-testbench-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>${skip.uitest.deployment}</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <configuration>
-                        <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <!-- Profile used to deploy the uitest-common jar for testing -->
-            <id>dev-build</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <skip.uitest.deployment>false</skip.uitest.deployment>
-            </properties>
-        </profile>
-    </profiles>
-
-</project>
diff --git a/uitest/pom.xml b/uitest/pom.xml
index d2abf4cd7c..5473a9d2f8 100644
--- a/uitest/pom.xml
+++ b/uitest/pom.xml
@@ -185,13 +185,6 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>vaadin-uitest-common</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
         </dependency>
@@ -228,6 +221,14 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-testbench-api</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        
     </dependencies>
 
     <build>
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java
index 4d61a6a491..4d61a6a491 100644
--- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/DateFieldElement.java
index 3c0348ee02..3c0348ee02 100644
--- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/testbench/customelements/DateFieldElement.java
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java
index 022acbfa8a..022acbfa8a 100644
--- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java
index 27d6d90640..27d6d90640 100644
--- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java
+++ b/uitest/src/test/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java
diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/LoginFormElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/LoginFormElement.java
index 59cd0444e7..59cd0444e7 100644
--- a/uitest-common/src/main/java/com/vaadin/testbench/customelements/LoginFormElement.java
+++ b/uitest/src/test/java/com/vaadin/testbench/customelements/LoginFormElement.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
index 0322d76949..0322d76949 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
index 7ab0c33c8a..7ab0c33c8a 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
index ad5988d571..ad5988d571 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
index 8dcd813ad8..8dcd813ad8 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
index db3989edb5..db3989edb5 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
index 1193ba9334..1193ba9334 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
index e270e26c53..e270e26c53 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java b/uitest/src/test/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
index 20107f8058..20107f8058 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index abee2c1c2c..abee2c1c2c 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
index cd735ae76b..cd735ae76b 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
index e95195d061..e95195d061 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
index ffc4ec9043..ffc4ec9043 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
index 2bbc0a6420..2bbc0a6420 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
index 6a2e64d2ee..6a2e64d2ee 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
index 796d62aa50..796d62aa50 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
index 8635477491..8635477491 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
index 429f827999..429f827999 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java
diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
index 05d9614129..05d9614129 100644
--- a/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java