diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
index fca68e4c5f..60dd1b2acc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
@@ -344,24 +344,11 @@
         </dependency>
 		<dependency>
 			<groupId>javassist</groupId>
-			<artifactId>javassist</artifactId>
-        </dependency>
+			<artifactId>javassist</artifactId></dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.httpcomponents</groupId>-->
-            <!--<artifactId>httpclient</artifactId>-->
-            <!--<version>4.5</version>-->
-        <!--</dependency>-->
-
-
     </dependencies>
 
 </project>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java
index 233f6c06e1..fcd0800c63 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceTest.java
@@ -31,7 +31,6 @@ import org.wso2.carbon.registry.core.jdbc.realm.InMemoryRealmService;
 import org.wso2.carbon.registry.core.service.RegistryService;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.io.InputStream;
 import java.rmi.RemoteException;
@@ -39,7 +38,6 @@ import java.util.List;
 
 import static org.powermock.api.mockito.PowerMockito.*;
 
-@RunWith(PowerMockRunner.class)
 @PrepareForTest(GeoLocationProviderServiceImpl.class)
 public class GeoLocationProviderServiceTest {
 
@@ -129,14 +127,6 @@ public class GeoLocationProviderServiceTest {
         Assert.assertEquals(geoFenceNode.getQueryName(), SAMPLE_QUERY_NAME);
     }
 
-//    @Test(dependsOnMethods = "createGeoProximityAlert")
-//    public void getGeoProximityAlerts() throws Exception {
-//        String result;
-//        result = geoLocationProviderServiceImpl.getProximityAlerts(getDeviceIdentifier());
-//        Assert.assertNotNull(result);
-//        Assert.assertEquals(result,"{proximityDistance:100\"\", proximityTime:50\"\"}");
-//    }
-
     @Test(dependsOnMethods = "createGeoSpeedAlert")
     public void getGeoSpeedAlerts() throws Exception {
         String result;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
index 5d6ce5fe1c..cdb5fdc20f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
@@ -32,7 +32,7 @@
             <class name="org.wso2.carbon.device.mgt.core.app.mgt.AppManagementConfigurationManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>
             <class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>
-            <!--&lt;!&ndash;<class name="org.wso2.carbon.device.mgt.core.search.SearchDevice"/>&ndash;&gt;-->
+            <!--<class name="org.wso2.carbon.device.mgt.core.search.SearchDevice"/>-->
             <class name="org.wso2.carbon.device.mgt.core.dao.GroupPersistTests"/>
             </classes>
     </test>
diff --git a/pom.xml b/pom.xml
index 1757d6e0ee..c30878f9e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1532,13 +1532,6 @@
                 <version>${power.mock.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>org.powermock</groupId>
-                <artifactId>powermock-module-junit4</artifactId>
-                <version>${power.mock.version}</version>
-
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>