diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml
index 38ba36543d4..7bd5e03b5bf 100644
--- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml
@@ -106,13 +106,19 @@
org.apache.maven.plugins
maven-surefire-plugin
+
+ --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
+ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+
- file:src/test/resources/carbon-home/repository/conf/log4j.properties
-
+ file:src/test/resources/log4j.properties
src/test/resources/testng.xml
+
+ org.ops4j.pax.logging
+
@@ -207,5 +213,15 @@
org.wso2.orbit.javax.xml.bind
jaxb-api
+
+ com.sun.xml.bind
+ jaxb-core
+ test
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ test
+
diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml
index 8b1dc93e222..16d45fccce3 100644
--- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml
@@ -104,6 +104,21 @@
io.entgra.device.mgt.core.device.mgt.core
test
+
+ org.mockito
+ mockito-core
+ test
+
+
+ com.sun.xml.bind
+ jaxb-core
+ test
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ test
+
@@ -157,6 +172,25 @@
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
+ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+
+
+ file:src/test/resources/log4j.properties
+
+
+ src/test/resources/testng.xml
+
+
+ org.ops4j.pax.logging
+
+
+
org.jacoco
jacoco-maven-plugin
diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
index ed434c7873a..ec115c2905a 100644
--- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
@@ -122,6 +122,16 @@
powermock-module-testng
test
+
+ org.wso2.carbon
+ org.wso2.carbon.securevault
+ test
+
+
+ org.mockito
+ mockito-core
+ test
+
@@ -189,6 +199,25 @@
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+
+
+ --add-opens=java.xml/jdk.xml.internal=ALL-UNNAMED
+ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED
+
+
+ file:src/test/resources/log4j.properties
+
+
+ src/test/resources/testng.xml
+
+
+ org.ops4j.pax.logging
+
+
+
diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml
deleted file mode 100644
index a5518cb720e..00000000000
--- a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/conf/carbon.xml
+++ /dev/null
@@ -1,658 +0,0 @@
-
-
-
-
-
-
-
-
- ${product.name}
-
-
- ${product.key}
-
-
- ${product.version}
-
-
-
-
-
-
-
-
- local:/${carbon.context}/services/
-
-
-
-
-
-
- ${default.server.role}
-
-
-
-
-
-
- org.wso2.carbon
-
-
- /
-
-
-
-
-
-
-
-
- 15
-
-
-
-
-
-
-
-
- 0
-
-
-
-
- 9999
-
- 11111
-
-
-
-
-
- 10389
-
- 8000
-
-
-
-
-
- 10500
-
-
-
-
-
-
- org.wso2.carbon.tomcat.jndi.CarbonJavaURLContextFactory
-
-
-
-
-
-
-
-
- java
-
-
-
-
-
-
-
-
-
- false
-
-
- false
-
-
- 600
-
-
-
- false
-
-
-
-
-
-
-
- 30
-
-
-
-
-
-
-
-
- 15
-
-
-
-
-
- ${carbon.home}/repository/deployment/server/
-
-
- 15
-
-
- ${carbon.home}/repository/conf/axis2/axis2.xml
-
-
- 30000
-
-
- ${carbon.home}/repository/deployment/client/
-
- ${carbon.home}/repository/conf/axis2/axis2_client.xml
-
- true
-
-
-
-
-
-
-
-
-
- admin
- Default Administrator Role
-
-
- user
- Default User Role
-
-
-
-
-
-
-
-
-
-
-
- ${carbon.home}/repository/resources/security/wso2carbon.jks
-
- JKS
-
- wso2carbon
-
- wso2carbon
-
- wso2carbon
-
-
-
-
-
- ${carbon.home}/repository/resources/security/client-truststore.jks
-
- JKS
-
- wso2carbon
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- UserManager
-
-
- false
-
-
-
-
-
-
- ${carbon.home}/tmp/work
-
-
-
-
-
- true
-
-
- 10
-
-
- 30
-
-
-
-
-
- 100
-
-
-
- keystore
- certificate
- *
-
- org.wso2.carbon.ui.transports.fileupload.AnyFileUploadExecutor
-
-
-
-
- jarZip
-
- org.wso2.carbon.ui.transports.fileupload.JarZipUploadExecutor
-
-
-
- dbs
-
- org.wso2.carbon.ui.transports.fileupload.DBSFileUploadExecutor
-
-
-
- tools
-
- org.wso2.carbon.ui.transports.fileupload.ToolsFileUploadExecutor
-
-
-
- toolsAny
-
- org.wso2.carbon.ui.transports.fileupload.ToolsAnyFileUploadExecutor
-
-
-
-
-
-
- - info
- org.wso2.carbon.core.transports.util.InfoProcessor
-
-
- - wsdl
- org.wso2.carbon.core.transports.util.Wsdl11Processor
-
-
- - wsdl2
- org.wso2.carbon.core.transports.util.Wsdl20Processor
-
-
- - xsd
- org.wso2.carbon.core.transports.util.XsdProcessor
-
-
-
-
-
- false
- false
- true
- svn
- http://svnrepo.example.com/repos/
- username
- password
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${require.carbon.servlet}
-
-
-
-
- true
-
-
-
-
-
-
- default repository
- ${p2.repo.url}
-
-
-
-
-
-
-
- true
-
-
-
-
-
- true
-
-
diff --git a/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/repository/conf/carbon.xml b/components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/src/test/resources/repository/conf/carbon.xml
new file mode 100644
index 00000000000..e69de29bb2d