diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index d503ea18..fd8df3d6 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -35,7 +35,7 @@
     <modules>
         <!--<module>tests-artifacts</module>-->
         <module>tests-common</module>
-        <!--<module>tests-integration</module>-->
+        <module>tests-integration</module>
         <!--<module>tests-ui-integration</module>-->
         <module>tests-iot-web-ui</module>
     </modules>
diff --git a/modules/integration/tests-integration-old/pom.xml b/modules/integration/tests-integration-old/pom.xml
new file mode 100644
index 00000000..437be7bb
--- /dev/null
+++ b/modules/integration/tests-integration-old/pom.xml
@@ -0,0 +1,266 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-integration</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tests-integration</artifactId>
+    <packaging>jar</packaging>
+    <name>WSO2 IoT Server Backend Integration Tests</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <inherited>false</inherited>
+                <version>2.12.4</version>
+                <configuration>
+                    <argLine>-Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</argLine>
+                    <parallel>false</parallel>
+                    <suiteXmlFiles>
+                        <suiteXmlFile>src/test/resources/testng-server-mgt.xml</suiteXmlFile>
+                        <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+                    </suiteXmlFiles>
+
+                    <systemProperties>
+                        <property>
+                            <name>maven.test.haltafterfailure</name>
+                            <value>false</value>
+                        </property>
+                        <property>
+                            <name>carbon.zip</name>
+                            <value>
+                                ${basedir}/../../distribution/target/wso2iot-${carbon.iot.device.mgt.version}.zip
+                            </value>
+                        </property>
+                        <property>
+                            <name>framework.resource.location</name>
+                            <value>
+                                ${basedir}/src/test/resources/
+                            </value>
+                        </property>
+                        <property>
+                            <name>usedefaultlisteners</name>
+                            <value>false</value>
+                        </property>
+                        <sec.verifier.dir>${basedir}/target/security-verifier/</sec.verifier.dir>
+                        <instr.file>${basedir}/src/test/resources/instrumentation.txt</instr.file>
+                        <filters.file>${basedir}/src/test/resources/filters.txt</filters.file>
+                    </systemProperties>
+                    <workingDirectory>${basedir}/target</workingDirectory>
+                    <testFailureIgnore>false</testFailureIgnore>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+
+
+                    <execution>
+                        <id>copy-jacoco-dependencies</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/jacoco</outputDirectory>
+                            <includeTypes>jar</includeTypes>
+                            <includeArtifactIds>org.jacoco.agent</includeArtifactIds>
+                        </configuration>
+                    </execution>
+
+
+                    <execution>
+                        <id>copy-secVerifier</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/security-verifier</outputDirectory>
+                            <includeTypes>aar</includeTypes>
+                            <includeArtifactIds>SecVerifier</includeArtifactIds>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>unpack-jks</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.iot</groupId>
+                                    <artifactId>wso2iot</artifactId>
+                                    <version>${carbon.iot.device.mgt.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${basedir}/target/tobeCopied/</outputDirectory>
+                                    <includes>**/*.jks</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.7.1</version>
+                <configuration>
+                    <outputDirectory>${basedir}/target/report</outputDirectory>
+                    <outputName>registry-api-test</outputName>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>report-only</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources-jks</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/src/test/resources/keystores/products
+                            </outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>
+                                        ${basedir}/target/tobeCopied/wso2iot-${carbon.iot.device.mgt.version}/repository/resources/security/
+                                    </directory>
+                                    <includes>
+                                        <include>**/*.jks</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.automation</groupId>
+            <artifactId>org.wso2.carbon.automation.engine</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.automation</groupId>
+            <artifactId>org.wso2.carbon.automation.extensions</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.automation</groupId>
+            <artifactId>org.wso2.carbon.automation.test.utils</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.automationutils</groupId>
+            <artifactId>org.wso2.carbon.integration.common.utils</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.automationutils</groupId>
+            <artifactId>org.wso2.carbon.integration.common.extensions</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/AssertUtil.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/Constants.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/Constants.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/Constants.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/Constants.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMResponse.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/OAuthUtil.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/PayloadGenerator.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/RestClient.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/RestClient.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/RestClient.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/RestClient.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/TestBase.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/TestBase.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/common/TestBase.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/TestBase.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/configuration/ConfigurationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/configuration/AndroidConfigurationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/enrollment/WindowsEnrollment.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/mgt/AndroidDeviceManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/operation/AndroidOperation.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/device/policy/AndroidPolicy.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/feature/FeatureManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/license/LicenseManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/notification/NotificationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/operation/OperationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/policy/PolicyManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/role/RoleManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/user/UserManagement.java b/modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/user/UserManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/user/UserManagement.java
rename to modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/user/UserManagement.java
diff --git a/modules/integration/tests-integration-old/src/test/resources/automation.xml b/modules/integration/tests-integration-old/src/test/resources/automation.xml
new file mode 100644
index 00000000..c36ffbd8
--- /dev/null
+++ b/modules/integration/tests-integration-old/src/test/resources/automation.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<automation xmlns="automationSchema.xsd">
+    <!--  =================================================  -->
+    <!--                   Parameters                        -->
+    <!--  =================================================  -->
+    <configurations>
+        <!--
+         Change this to edit wait time for test artifact deployment
+        -->
+        <deploymentDelay>60000</deploymentDelay>
+        <!--
+         Change this to product|platform/cloud to execute test on specific environment
+        -->
+        <executionEnvironment>standalone</executionEnvironment>
+        <!--
+         Change this to user/tenant to execute test with user mode or tenant mode
+        -->
+        <multiTenantMode>false</multiTenantMode>
+        <!--
+         Change this to true if you want to generate coverage statistics
+        -->
+        <coverage>false</coverage>
+        <!--
+         Change this to true if you want to enable framework dashboard
+        -->
+        <frameworkDashboard>false</frameworkDashboard>
+        <!--
+         Browser type with used by framework to execute UI test, supported types - chrome|firefox|opera|ie|htmlUnit
+        -->
+    </configurations>
+    <tools>
+        <selenium>
+            <!-- Change to enable remote webDriver -->
+            <!-- URL of remote webDriver server  -->
+            <remoteDriverUrl enable="true">http://10.100.2.51:4444/wd/hub/</remoteDriverUrl>
+
+            <!-- Type of the browser selenium tests are running" -->
+            <browser>
+                <browserType>firefox</browserType>
+                <!-- path to webDriver executable - required only for chrome-->
+                <webdriverPath enable="false">/home/test/name/webDriver</webdriverPath>
+            </browser>
+        </selenium>
+    </tools>
+    <!--
+    Database configuration to be used for data service testing. DB configuration in dbs files will be replaced with
+               below configuration at test run time
+    -->
+    <datasources>
+        <datasource name="dataService">
+            <url>jdbc:h2:testDB</url>
+            <username>wso2carbon</username>
+            <password>wso2carbon</password>
+            <driverClassName>org.h2.Driver</driverClassName>
+        </datasource>
+        <datasource name="dataService1">
+            <url>jdbc:h2:testDB</url>
+            <username>wso2carbon</username>
+            <password>wso2carbon</password>
+            <driverClassName>org.h2.Driver</driverClassName>
+        </datasource>
+    </datasources>
+    <security>
+        <!--
+                    KeyStore which will be used for encrypting/decrypting passwords
+                    and other sensitive information.
+        -->
+        <keystore name="wso2">
+            <!--  Keystore file location -->
+            <fileName>keystores/products/wso2carbon.jks</fileName>
+            <!--  Keystore type (JKS/PKCS12 etc.) -->
+            <type>JKS</type>
+            <!--  Keystore password -->
+            <password>wso2carbon</password>
+            <!--  Private Key alias -->
+            <keyAlias>wso2carbon</keyAlias>
+            <!--  Private Key password -->
+            <keyPassword>wso2carbon</keyPassword>
+        </keystore>
+        <!--
+                    System wide trust-store which is used to maintain the certificates of all
+                    the trusted parties.
+        -->
+        <truststore name="wso2">
+            <!--  trust-store file location  -->
+            <fileName>client-truststore.jks</fileName>
+            <!--  trust-store type (JKS/PKCS12 etc.)  -->
+            <type>JKS</type>
+            <!--  trust-store password  -->
+            <password>wso2carbon</password>
+        </truststore>
+    </security>
+    <featureManagement>
+        <p2Repositories>
+            <repository name="localDefault">
+                <repository repo-id="online-repository">https://wso2.org/repo</repository>
+                <repository repo-id="file-repository">file:///home/krishantha/test</repository>
+            </repository>
+        </p2Repositories>
+    </featureManagement>
+    <!--
+               System wide users who to be registered at the test initiation
+    -->
+    <userManagement>
+        <superTenant>
+            <tenant domain="carbon.super" key="superTenant">
+                <admin>
+                    <user key="superAdmin">
+                        <userName>admin</userName>
+                        <password>admin</password>
+                    </user>
+                </admin>
+                <users>
+                    <user key="user1">
+                        <userName>testuser11</userName>
+                        <password>testuser11</password>
+                    </user>
+                    <user key="user2">
+                        <userName>testuser21</userName>
+                        <password>testuser21</password>
+                    </user>
+                </users>
+            </tenant>
+        </superTenant>
+        <tenants>
+            <tenant domain="wso2.com" key="wso2">
+                <admin>
+                    <user key="admin">
+                        <userName>admin</userName>
+                        <password>admin</password>
+                    </user>
+                </admin>
+                <users>
+                    <user key="user1">
+                        <userName>testuser11</userName>
+                        <password>testuser11</password>
+                    </user>
+                    <user key="user2">
+                        <userName>testuser21</userName>
+                        <password>testuser21</password>
+                    </user>
+                </users>
+            </tenant>
+        </tenants>
+    </userManagement>
+    <!--
+   This section will initiate the initial deployment of the platform required by
+   the test suites.
+-->
+    <platform>
+        <!--
+        cluster instance details to be used to platform test execution
+        -->
+        <productGroup name="MDM" clusteringEnabled="false" default="true">
+
+            <instance name="mdm" type="standalone" nonBlockingTransportEnabled="false">
+                <hosts>
+                    <host type="default">localhost</host>
+                </hosts>
+                <ports>
+                    <port type="http">10863</port>
+                    <port type="https">10543</port>
+                </ports>
+                <properties>
+
+                </properties>
+            </instance>
+        </productGroup>
+    </platform>
+
+    <listenerExtensions>
+
+        <!--<className>org.wso2.carbon.automation.extentions.servers.wso2server.Wso2ServerExtention</className>-->
+        <platformExecutionManager>
+            <extentionClasses>
+                <class>
+                    <name>
+                        org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension
+                    </name>
+                    <parameter name="-DportOffset" value="1100"/>
+                    <!--<parameter name="cmdArg" value="debug 5005" />-->
+                </class>
+                <class>
+                    <name>
+                        org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension
+                    </name>
+                </class>
+            </extentionClasses>
+        </platformExecutionManager>
+
+
+        <PlatformSuiteManager>
+            <extentionClasses>
+                <!--<className>org.wso2.carbon.automation.extentions.servers.wso2server.Wso2ServerExtention</className>-->
+            </extentionClasses>
+        </PlatformSuiteManager>
+
+        <PlatformAnnotationTransferManager>
+            <extentionClasses>
+                <!--<className>org.wso2.carbon.automation.extentions.servers.wso2server.Wso2ServerExtention</className>-->
+            </extentionClasses>
+        </PlatformAnnotationTransferManager>
+
+        <PlatformTestManager>
+            <extentionClasses>
+            </extentionClasses>
+        </PlatformTestManager>
+
+        <PlatformReportManager>
+            <extentionClasses>
+            </extentionClasses>
+        </PlatformReportManager>
+
+    </listenerExtensions>
+</automation>
diff --git a/modules/integration/tests-integration/src/test/resources/automationSchema.xsd b/modules/integration/tests-integration-old/src/test/resources/automationSchema.xsd
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/automationSchema.xsd
rename to modules/integration/tests-integration-old/src/test/resources/automationSchema.xsd
diff --git a/modules/integration/tests-integration-old/src/test/resources/filters.txt b/modules/integration/tests-integration-old/src/test/resources/filters.txt
new file mode 100644
index 00000000..8813e634
--- /dev/null
+++ b/modules/integration/tests-integration-old/src/test/resources/filters.txt
@@ -0,0 +1,23 @@
+-org.wso2.carbon.caching.core.identity.*
+-org.wso2.carbon.caching.core.permissiontree.*
+-org.wso2.carbon.caching.infinispan.*
+-org.wso2.carbon.event.core.internal.delivery.jms.*
+-org.wso2.carbon.event.core.qpid.*
+-org.wso2.carbon.registry.synchronization.*
+-*.stub*
+-*.stub_
+-*.stub_4.0.0
+-*.stub-
+-org.eclipse.*
+-*.equinox.*
+-org.wso2.carbon.user.core.*
+-samples.*
+-*.log4j*
+-*.axis2*
+-*.ui*
+-*.tenant*
+-*.stratos*
+-*.eventing*
+-*tests-transports*
+-org.wso2.carbon.mediation.statistics*
+-*startup*
diff --git a/modules/integration/tests-integration-old/src/test/resources/instrumentation.txt b/modules/integration/tests-integration-old/src/test/resources/instrumentation.txt
new file mode 100644
index 00000000..f9f1894a
--- /dev/null
+++ b/modules/integration/tests-integration-old/src/test/resources/instrumentation.txt
@@ -0,0 +1,41 @@
+org.wso2.carbon.caching.core_
+org.wso2.carbon.discovery.core_
+org.wso2.carbon.discovery.proxy_
+org.wso2.carbon.email.verification_
+org.wso2.carbon.event.core_
+org.wso2.carbon.governance.custom.lifecycles.checklist_
+org.wso2.carbon.governance.gadgets.impactanalysis_
+org.wso2.carbon.governance.gadgetsource_
+org.wso2.carbon.governance.gadgets.resourceimpact_
+org.wso2.carbon.governance.generic_
+org.wso2.carbon.governance.lcm_
+org.wso2.carbon.governance.list_
+org.wso2.carbon.governance.platform.extensions_
+org.wso2.carbon.governance.registry.eventing_
+org.wso2.carbon.governance.registry.extensions_
+org.wso2.carbon.governance.services_
+org.wso2.carbon.identity.user.profile_
+org.wso2.carbon.mashup.javascript.hostobjects.registry_
+org.wso2.carbon.registry.activities_
+org.wso2.carbon.registry.common_
+org.wso2.carbon.registry.core_
+org.wso2.carbon.registry.eventing_
+org.wso2.carbon.registry.extensions_
+org.wso2.carbon.registry.handler_
+org.wso2.carbon.registry.indexing_
+org.wso2.carbon.registry.info_
+org.wso2.carbon.registry.profiles_
+org.wso2.carbon.registry.properties_
+org.wso2.carbon.registry.relations_
+org.wso2.carbon.registry.reporting_
+org.wso2.carbon.registry.resource_
+org.wso2.carbon.registry.search_
+org.wso2.carbon.registry.server_
+org.wso2.carbon.registry.servlet_
+org.wso2.carbon.registry.task_
+org.wso2.carbon.registry.uddi_
+org.wso2.carbon.registry.webdav_
+org.wso2.carbon.registry.ws.api_
+org.wso2.carbon.reporting.api_
+org.wso2.carbon.reporting.core_
+org.wso2.carbon.reporting.util_
diff --git a/modules/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks b/modules/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks
new file mode 100644
index 00000000..ab222fdd
Binary files /dev/null and b/modules/integration/tests-integration-old/src/test/resources/keystores/products/client-truststore.jks differ
diff --git a/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks b/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks
new file mode 100644
index 00000000..79784a5e
Binary files /dev/null and b/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2carbon.jks differ
diff --git a/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks b/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks
new file mode 100644
index 00000000..eb27997d
Binary files /dev/null and b/modules/integration/tests-integration-old/src/test/resources/keystores/products/wso2certs.jks differ
diff --git a/modules/integration/tests-integration-old/src/test/resources/log4j.properties b/modules/integration/tests-integration-old/src/test/resources/log4j.properties
new file mode 100644
index 00000000..bc395345
--- /dev/null
+++ b/modules/integration/tests-integration-old/src/test/resources/log4j.properties
@@ -0,0 +1,45 @@
+#
+# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+#
+# WSO2 Inc. licenses this file to you under the Apache License,
+# Version 2.0 (the "License"); you may not use this file except
+# in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
+# This is the log4j configuration file used by WSO2 Carbon
+#
+# IMPORTANT : Please do not remove or change the names of any
+# of the Appenders defined here. The layout pattern & log file
+# can be changed using the WSO2 Carbon Management Console, and those
+# settings will override the settings in this file.
+#
+
+log4j.rootLogger=INFO, console, Default
+
+log4j.logger.org.wso2=INFO
+log4j.logger.org.apache.axis2.deployment.ModuleDeployer=ERROR
+#Automation file apender
+log4j.appender.Default=org.apache.log4j.RollingFileAppender
+log4j.appender.Default.File=logs/automation.log
+log4j.appender.Default.Append=true
+log4j.appender.Default.MaxFileSize=10MB
+log4j.appender.Default.MaxBackupIndex=10
+log4j.appender.Default.layout=org.apache.log4j.PatternLayout
+log4j.appender.Default.layout.ConversionPattern=%d{ISO8601} %-5p [%c] - %m%n
+
+
+#Automation console apender
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p [%c] - %m%n
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-config-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-config-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-config-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-config-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-configuration-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-configuration-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-configuration-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-configuration-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-device-mgt-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-device-mgt-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-device-mgt-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-device-mgt-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-enrollment-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-operation-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-operation-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-operation-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-operation-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-policy-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/android-policy-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-policy-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/android-policy-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/configuration-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/configuration-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/configuration-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/configuration-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/configuration-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/configuration-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/configuration-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/configuration-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/get-notifications-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/get-notifications-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/get-notifications-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/get-notifications-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/license-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/license-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/license-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/license-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/notification-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/notification-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/notification-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/notification-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/notification-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/notification-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/notification-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/notification-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/policy-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/policy-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/policy-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/policy-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/policy-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/policy-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/policy-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/policy-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/role-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/role-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/role-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/role-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/user-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/user-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/user-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/user-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json b/modules/integration/tests-integration-old/src/test/resources/payloads/user-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
rename to modules/integration/tests-integration-old/src/test/resources/payloads/user-response-payloads.json
diff --git a/modules/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml b/modules/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml
new file mode 100644
index 00000000..fa3a3fa7
--- /dev/null
+++ b/modules/integration/tests-integration-old/src/test/resources/testng-server-mgt.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="mdm-suite">
+
+</suite>
\ No newline at end of file
diff --git a/modules/integration/tests-integration-old/src/test/resources/testng.xml b/modules/integration/tests-integration-old/src/test/resources/testng.xml
new file mode 100644
index 00000000..00843078
--- /dev/null
+++ b/modules/integration/tests-integration-old/src/test/resources/testng.xml
@@ -0,0 +1,112 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+
+<suite name="mdm-suite-initializer">
+    <parameter name="useDefaultListeners" value="false"/>
+    <listeners>
+        <listener
+                class-name="org.wso2.carbon.automation.engine.testlisteners.TestExecutionListener"/>
+        <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestManagerListener"/>
+        <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/>
+        <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestSuiteListener"/>
+        <listener
+                class-name="org.wso2.carbon.automation.engine.testlisteners.TestTransformerListener"/>
+    </listeners>
+    <test name="mobile-device-mgt-no-devices" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.mobileDevice.MobileDeviceManagementWithNoDevices"/>
+        </classes>
+    </test>
+    <test name="android-enrollment" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.device.enrollment.AndroidEnrollment"/>
+        </classes>
+    </test>
+    <test name="android-operation" preserve-order="false" parallel="true">
+        <classes>
+            <class name="org.wso2.mdm.integration.device.operation.AndroidOperation"/>
+        </classes>
+    </test>
+    <test name="windows-enrollment" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.device.enrollment.WindowsEnrollment"/>
+        </classes>
+    </test>
+    <test name="android-device-mgt" preserve-order="false" parallel="true">
+        <classes>
+            <class name="org.wso2.mdm.integration.device.mgt.AndroidDeviceManagement"/>
+        </classes>
+    </test>
+    <test name="android-configuration" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.device.configuration.AndroidConfigurationManagement"/>
+        </classes>
+    </test>
+    <test name="android-policy" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.device.policy.AndroidPolicy"/>
+        </classes>
+    </test>
+    <test name="operation-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.operation.OperationManagement"/>
+        </classes>
+    </test>
+    <test name="mobile-device-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.mobileDevice.MobileDeviceManagement"/>
+        </classes>
+    </test>
+    <test name="user-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.user.UserManagement"/>
+        </classes>
+    </test>
+    <test name="role-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.role.RoleManagement"/>
+        </classes>
+    </test>
+    <test name="policy-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.policy.PolicyManagement"/>
+        </classes>
+    </test>
+    <test name="feature-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.feature.FeatureManagement"/>
+        </classes>
+    </test>
+    <test name="license-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.license.LicenseManagement"/>
+        </classes>
+    </test>
+    <test name="configuration-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.configuration.ConfigurationManagement"/>
+        </classes>
+    </test>
+    <test name="notification-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.notification.NotificationManagement"/>
+        </classes>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/additional_device_info.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/additional_device_info.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/additional_device_info.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/additional_device_info.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/discovery-post.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/discovery-post.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/discovery-post.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/discovery-post.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/inital_device_info.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/inital_device_info.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/inital_device_info.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/inital_device_info.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/ms_xcep.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/ms_xcep.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/ms_xcep.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/ms_xcep.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/wstep.xml b/modules/integration/tests-integration-old/src/test/resources/windows/enrollment/wstep.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/wstep.xml
rename to modules/integration/tests-integration-old/src/test/resources/windows/enrollment/wstep.xml
diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
index f9f1894a..917b2bb7 100644
--- a/modules/integration/tests-integration/src/test/resources/instrumentation.txt
+++ b/modules/integration/tests-integration/src/test/resources/instrumentation.txt
@@ -1,41 +1,11 @@
-org.wso2.carbon.caching.core_
-org.wso2.carbon.discovery.core_
-org.wso2.carbon.discovery.proxy_
-org.wso2.carbon.email.verification_
-org.wso2.carbon.event.core_
-org.wso2.carbon.governance.custom.lifecycles.checklist_
-org.wso2.carbon.governance.gadgets.impactanalysis_
-org.wso2.carbon.governance.gadgetsource_
-org.wso2.carbon.governance.gadgets.resourceimpact_
-org.wso2.carbon.governance.generic_
-org.wso2.carbon.governance.lcm_
-org.wso2.carbon.governance.list_
-org.wso2.carbon.governance.platform.extensions_
-org.wso2.carbon.governance.registry.eventing_
-org.wso2.carbon.governance.registry.extensions_
-org.wso2.carbon.governance.services_
-org.wso2.carbon.identity.user.profile_
-org.wso2.carbon.mashup.javascript.hostobjects.registry_
-org.wso2.carbon.registry.activities_
-org.wso2.carbon.registry.common_
-org.wso2.carbon.registry.core_
-org.wso2.carbon.registry.eventing_
-org.wso2.carbon.registry.extensions_
-org.wso2.carbon.registry.handler_
-org.wso2.carbon.registry.indexing_
-org.wso2.carbon.registry.info_
-org.wso2.carbon.registry.profiles_
-org.wso2.carbon.registry.properties_
-org.wso2.carbon.registry.relations_
-org.wso2.carbon.registry.reporting_
-org.wso2.carbon.registry.resource_
-org.wso2.carbon.registry.search_
-org.wso2.carbon.registry.server_
-org.wso2.carbon.registry.servlet_
-org.wso2.carbon.registry.task_
-org.wso2.carbon.registry.uddi_
-org.wso2.carbon.registry.webdav_
-org.wso2.carbon.registry.ws.api_
-org.wso2.carbon.reporting.api_
-org.wso2.carbon.reporting.core_
-org.wso2.carbon.reporting.util_
+org.wso2.carbon.datasource_
+org.wso2.carbon.dataservices.core_
+org.wso2.carbon.transaction.manager_
+org.wso2.carbon.dataservices.sql.driver_
+org.wso2.carbon.dataservices.task_
+org.wso2.carbon.ndatasource.common_
+org.wso2.carbon.ndatasource.core_
+org.wso2.carbon.ndatasource.rdbms_
+org.wso2.carbon.ntask.common_
+org.wso2.carbon.ntask.core_
+org.wso2.carbon.ntask.solutions_
diff --git a/modules/integration/tests-integration/src/test/resources/testng.xml b/modules/integration/tests-integration/src/test/resources/testng.xml
index 00843078..2cfc4734 100644
--- a/modules/integration/tests-integration/src/test/resources/testng.xml
+++ b/modules/integration/tests-integration/src/test/resources/testng.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
   ~ WSO2 Inc. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -18,95 +18,21 @@
 
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 
-<suite name="mdm-suite-initializer">
+<suite name="DssTestSuite" parallel="false">
     <parameter name="useDefaultListeners" value="false"/>
+
     <listeners>
-        <listener
-                class-name="org.wso2.carbon.automation.engine.testlisteners.TestExecutionListener"/>
+        <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestExecutionListener"/>
         <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestManagerListener"/>
         <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestReportListener"/>
         <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestSuiteListener"/>
-        <listener
-                class-name="org.wso2.carbon.automation.engine.testlisteners.TestTransformerListener"/>
+        <listener class-name="org.wso2.carbon.automation.engine.testlisteners.TestTransformerListener"/>
     </listeners>
-    <test name="mobile-device-mgt-no-devices" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.mobileDevice.MobileDeviceManagementWithNoDevices"/>
-        </classes>
-    </test>
-    <test name="android-enrollment" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.device.enrollment.AndroidEnrollment"/>
-        </classes>
-    </test>
-    <test name="android-operation" preserve-order="false" parallel="true">
-        <classes>
-            <class name="org.wso2.mdm.integration.device.operation.AndroidOperation"/>
-        </classes>
-    </test>
-    <test name="windows-enrollment" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.device.enrollment.WindowsEnrollment"/>
-        </classes>
-    </test>
-    <test name="android-device-mgt" preserve-order="false" parallel="true">
-        <classes>
-            <class name="org.wso2.mdm.integration.device.mgt.AndroidDeviceManagement"/>
-        </classes>
-    </test>
-    <test name="android-configuration" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.device.configuration.AndroidConfigurationManagement"/>
-        </classes>
-    </test>
-    <test name="android-policy" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.device.policy.AndroidPolicy"/>
-        </classes>
-    </test>
-    <test name="operation-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.operation.OperationManagement"/>
-        </classes>
-    </test>
-    <test name="mobile-device-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.mobileDevice.MobileDeviceManagement"/>
-        </classes>
-    </test>
-    <test name="user-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.user.UserManagement"/>
-        </classes>
-    </test>
-    <test name="role-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.role.RoleManagement"/>
-        </classes>
-    </test>
-    <test name="policy-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.policy.PolicyManagement"/>
-        </classes>
-    </test>
-    <test name="feature-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.feature.FeatureManagement"/>
-        </classes>
-    </test>
-    <test name="license-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.license.LicenseManagement"/>
-        </classes>
-    </test>
-    <test name="configuration-mgt" preserve-order="true" parallel="false">
-        <classes>
-            <class name="org.wso2.mdm.integration.configuration.ConfigurationManagement"/>
-        </classes>
-    </test>
-    <test name="notification-mgt" preserve-order="true" parallel="false">
+
+    <test name="IOT-Integration-Test" parallel="false" verbose="2">
         <classes>
-            <class name="org.wso2.mdm.integration.notification.NotificationManagement"/>
+
         </classes>
+
     </test>
-</suite>
\ No newline at end of file
+</suite>
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml b/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml
index 2188561b..3b2623fb 100644
--- a/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml
+++ b/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml
@@ -40,6 +40,5 @@
             <class name="org.wso2.carbon.iot.integration.web.ui.test.samples.SampleEnrolmentVerificationTest"/>
             <class name="org.wso2.carbon.iot.integration.web.ui.test.samples.SampleFunctionalityTest"/>
         </classes>
-
     </test>
 </suite>