diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 019142c200..5b798a4ff0 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -17,12 +17,6 @@
     <description>WSO2 Connected Device Manager (CDM) Distribution</description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.shindig</groupId>
-            <artifactId>shindig-server</artifactId>
-            <version>2.5.0-beta5</version>
-            <type>war</type>
-        </dependency>
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>el-api</artifactId>
@@ -76,19 +70,9 @@
                                     <overWrite>true</overWrite>
                                     <outputDirectory>target</outputDirectory>
                                 </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.shindig</groupId>
-                                    <artifactId>shindig-server</artifactId>
-                                    <version>2.5.0-beta5</version>
-                                    <type>war</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>target/shindig</outputDirectory>
-                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
-
-
                 </executions>
             </plugin>
 
@@ -107,7 +91,7 @@
                             <tasks>
                                 <property name="tempdir" value="target/docs-temp"/>
                                 <property name="jardir" value="target/jars"/>
-                                <property name="shindig.version" value="2.5.0-beta5"/>
+                                <!--<property name="shindig.version" value="2.5.0-beta5"/>-->
 
                                 <mkdir dir="${tempdir}"/>
                                 <mkdir dir="${tempdir}/wso2emm-${project.version}/repository/components"/>
@@ -122,7 +106,7 @@
                                             dir="${tempdir}/wso2emm-${project.version}/repository/components"></fileset>
                                 </copy>
                                 <!--testing -->
-                                <unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar"
+                                <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar"
                                        dest="${jardir}/shindig-common-${shindig.version}">
                                     <patternset>
                                         <exclude name="**/shindig.properties"/>
@@ -137,7 +121,7 @@
                                     <fileset dir="target/shindig/WEB-INF/lib" includes="slf4j*"/>
                                 </delete>
                                 <copy file="src/repository/resources/shindig/index.jsp"
-                                      todir="target/shindig"/>
+                                      todir="target/shindig"/>-->
 
                                 <concat destfile="target/wso2carbon-core-${carbon.kernal.version}/repository/log4j.properties">
                                     og4j.logger.net.sf.ehcache=ERROR
@@ -153,7 +137,7 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <copy todir="target/wso2carbon-core-${carbon.kernal.version}/modules"
+                                <!--<copy todir="target/wso2carbon-core-${carbon.kernal.version}/modules"
                                       overwrite="true">
                                     <fileset dir="src/repository/modules"></fileset>
                                 </copy>
@@ -165,7 +149,7 @@
                                 <copy todir="target/wso2carbon-core-${carbon.kernal.version}/repository/components/plugins"
                                       overwrite="true">
                                     <fileset dir="src/repository/components/patches/apimgt"></fileset>
-                                </copy>
+                                </copy>-->
 
                             </tasks>
                         </configuration>
@@ -189,7 +173,7 @@
                                 <delete dir="target/site"/>
                                 <delete dir="target/antrun"/>
                                 <delete dir="src/site"/>
-                                <delete dir="target/shindig"/>
+                                <!--<delete dir="target/shindig"/>-->
                                 <delete dir="target/jaxwebapps"/>
                             </tasks>
                         </configuration>
@@ -203,6 +187,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.2</version>
                 <executions>
                     <execution>
                         <id>1-pre-dist</id>
@@ -212,6 +197,7 @@
                             <goal>attached</goal>
                         </goals>
                         <configuration>
+                            <appendAssemblyId>false</appendAssemblyId>
                             <filters>
                                 <filter>${basedir}/src/assembly/filter.properties</filter>
                             </filters>
@@ -221,7 +207,7 @@
                         </configuration>
                     </execution>
 
-                    <execution>
+                   <!-- <execution>
                         <id>2-dist</id>
                         <phase>package</phase>
                         <goals>
@@ -233,12 +219,9 @@
                             </filters>
                             <descriptors>
                                 <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-                                <!--
-                                                                <descriptor>${basedir}/src/assembly/docs.xml</descriptor>
-                                -->
                             </descriptors>
                         </configuration>
-                    </execution>
+                    </execution>-->
                 </executions>
             </plugin>
 
diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml
index d94b446512..d1bd5ea4f9 100644
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@@ -16,6 +16,7 @@
  ~ under the License.
  -->
 <assembly>
+    <id>1-pre-dist</id>
     <formats>
         <format>zip</format>
     </formats>
diff --git a/pom.xml b/pom.xml
index 2f1b5fe83b..d13e5e45ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,67 @@
         <module>modules/features</module>
         <module>modules/p2-profile-gen</module>
         <module>modules/distribution</module>
-        <!--<module>modules/integration</module>-->
+        <module>modules/integration</module>
     </modules>
 
     <properties>
         <carbon.kernal.version>4.2.0</carbon.kernal.version>
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
+
+        <!--Testing -->
+        <test.framework.version>4.3.1</test.framework.version>
+        <testng.version>6.8</testng.version>
+        <stub.version>4.3.0-SNAPSHOT</stub.version>
+        <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
     </properties>
 
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.wso2.emm</groupId>
+                <artifactId>org.wso2.emm.integration.ui.pages</artifactId>
+                <version>${test.automation.emm.ui.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.automation</groupId>
+                <artifactId>org.wso2.carbon.automation.engine</artifactId>
+                <version>${test.framework.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.automation</groupId>
+                <artifactId>org.wso2.carbon.automation.test.utils</artifactId>
+                <version>${test.framework.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
+                <version>${stub.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.automation</groupId>
+                <artifactId>org.wso2.carbon.automation.extensions</artifactId>
+                <version>${test.framework.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${testng.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.integration.common.admin.client</artifactId>
+                <version>${stub.version}</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>