diff --git a/deps/pom.xml b/deps/pom.xml
index 239e1f1d5f2..f99e7feb78d 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -102,6 +102,11 @@
       <groupId>org.apache.cloudstack</groupId>
       <artifactId>cloud-awsapi</artifactId>
       <version>${project.version}</version>
+    </dependency>
+     <dependency>
+      <groupId>org.apache.cloudstack</groupId>
+      <artifactId>cloud-testclient</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>mysql</groupId>
@@ -136,7 +141,7 @@
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>false</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
-              <excludeArtifactIds>cloud-core,cloud-server,cloud-api,cloud-utils,cloud-vmware-base,cloud-agent,cloud-plugin-host-allocator-random,cloud-plugin-hypervisor-kvm,cloud-plugin-hypervisor-ovm,cloud-plugin-hypervisor-vmware,cloud-plugin-hypervisor-xen,cloud-plugin-netapp,cloud-plugin-network-elb,cloud-plugin-network-f5,cloud-plugin-network-netscaler,cloud-plugin-network-nvp,cloud-plugin-network-ovs,cloud-plugin-network-srx,cloud-plugin-planner-user-concentrated-pod,cloud-plugin-planner-user-dispersing,cloud-plugin-storage-allocator-random,cloud-plugin-user-authenticator-ldap,cloud-plugin-user-authenticator-md5,cloud-plugin-user-authenticator-plaintext,cloud-utils,cloud-vmware-base,cloud-awsapi</excludeArtifactIds>
+              <excludeArtifactIds>cloud-core,cloud-server,cloud-api,cloud-vmware-base,cloud-agent,cloud-plugin-host-allocator-random,cloud-plugin-hypervisor-kvm,cloud-plugin-hypervisor-ovm,cloud-plugin-hypervisor-vmware,cloud-plugin-hypervisor-xen,cloud-plugin-netapp,cloud-plugin-network-elb,cloud-plugin-network-f5,cloud-plugin-network-netscaler,cloud-plugin-network-nvp,cloud-plugin-network-ovs,cloud-plugin-network-srx,cloud-plugin-planner-user-concentrated-pod,cloud-plugin-planner-user-dispersing,cloud-plugin-storage-allocator-random,cloud-plugin-user-authenticator-ldap,cloud-plugin-user-authenticator-md5,cloud-plugin-user-authenticator-plaintext,cloud-utils,cloud-vmware-base,cloud-awsapi,cloud-testclient</excludeArtifactIds>
             </configuration>
           </execution>
         </executions>
diff --git a/pom.xml b/pom.xml
index dc7433525d2..332e775a802 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,7 @@
     <cs.neethi.version>2.0.4</cs.neethi.version>
     <cs.servlet.version>2.4</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>
-    <cs.selenium.java.version>2.24.1</cs.selenium.java.version>
-
+    <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
     <skipTests>true</skipTests>
 
   </properties>
@@ -158,6 +157,7 @@
     <module>plugins</module>
     <module>awsapi</module>
     <module>patches</module>
+    <module>test</module>
   </modules>
 
   <dependencies>
diff --git a/test/pom.xml b/test/pom.xml
index 53e0bcdca08..f70a89f825a 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -19,7 +19,7 @@
 <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>
-    <artifactId>cloud-test</artifactId>
+    <artifactId>cloud-testclient</artifactId>
     <name>Apache CloudStack Test</name>
     <parent>
         <groupId>org.apache.cloudstack</groupId>
@@ -27,6 +27,11 @@
         <version>4.0.0-SNAPSHOT</version>
     </parent>
     <dependencies>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -34,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>org.junit</artifactId>
+            <artifactId>junit</artifactId>
             <version>${cs.junit.version}</version>
         </dependency>
         <dependency>
@@ -54,13 +59,23 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>${cs.selenium.java.version}</version>
+            <groupId>org.openqa.selenium.server</groupId>
+            <artifactId>selenium-server</artifactId>
+            <version>${cs.selenium.server.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+            <artifactId>selenium-java-client-driver</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>${cs.httpclient.version}</version>
         </dependency>
     </dependencies>
     <build>
-        <defaultGoal>install</defaultGoal>
+        <defaultGoal>compile</defaultGoal>
         <sourceDirectory>src</sourceDirectory>
         <testSourceDirectory>test</testSourceDirectory>
         <plugins>