diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java b/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
index b7e947b88..b37159959 100644
--- a/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
+++ b/modules/integration/tests-integration/src/test/java/org/wso2/mdm/integration/device/enrollment/AndroidEnrollment.java
@@ -46,7 +46,7 @@ public void testEnrollment() throws Exception {
         enrollmentData.addProperty(Constants.DEVICE_IDENTIFIER_KEY, Constants.DEVICE_ID);
         MDMResponse response = client.post(Constants.AndroidEnrollment.ENROLLMENT_ENDPOINT,
                 enrollmentData.toString());
-        Assert.assertEquals(HttpStatus.SC_CREATED, response.getStatus());
+        Assert.assertEquals(HttpStatus.SC_OK, response.getStatus());
         Assert.assertTrue(response.getBody().contains(Constants.AndroidEnrollment.ENROLLMENT_RESPONSE_PAYLOAD_FOR_POST));
     }
 
diff --git a/modules/integration/tests-integration/src/test/resources/testng.xml b/modules/integration/tests-integration/src/test/resources/testng.xml
index b7331d704..2977e4296 100644
--- a/modules/integration/tests-integration/src/test/resources/testng.xml
+++ b/modules/integration/tests-integration/src/test/resources/testng.xml
@@ -96,11 +96,11 @@
             <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.AndroidPolicyManagement"/>-->
-        <!--</classes>-->
-    <!--</test>-->
+    <test name="policy-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.policy.AndroidPolicyManagement"/>
+        </classes>
+    </test>
     <!--<test name="windows-policy-mgt" preserve-order="true" parallel="false">-->
         <!--<classes>-->
             <!--<class name="org.wso2.mdm.integration.policy.WindowsPolicyManagement"/>-->
@@ -121,11 +121,11 @@
             <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>-->
+    <test name="notification-mgt" preserve-order="true" parallel="false">
+        <classes>
+            <class name="org.wso2.mdm.integration.notification.NotificationManagement"/>
+        </classes>
+    </test>
     <test name="certificate-mgt" preserve-order="true" parallel="false">
         <classes>
             <class name="org.wso2.mdm.integration.certificate.CertificateManagement"/>