diff --git a/pom.xml b/pom.xml
index 7ab0d0d139..3063828409 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1160,6 +1160,12 @@
             <version>1.2.2.Final</version>
             <scope>test</scope>
           </dependency>
+          <dependency>
+            <groupId>org.jboss.osgi.metadata</groupId>
+            <artifactId>jbosgi-metadata</artifactId>
+            <version>3.0.1.Final</version>
+            <scope>test</scope>
+          </dependency>
           <dependency>
             <groupId>org.jboss.remotingjmx</groupId>
             <artifactId>remoting-jmx</artifactId>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 216b9b822b..8c4529fba7 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -1131,8 +1131,7 @@
             <configuration>
               <usedDependencies combine.children="append">
                 <!-- used for arquillian tests -->
-                <usedDependency>org.wildfly:wildfly-embedded</usedDependency>
-                <usedDependency>org.wildfly:wildfly-arquillian-container-embedded</usedDependency>
+                <usedDependency>org.wildfly:wildfly-arquillian-container-managed</usedDependency>
                 <!-- NB: Don't add anything without a comment explaining how the
                      dependency is used -->
               </usedDependencies>
@@ -1216,7 +1215,7 @@
         </dependency>
         <dependency>
           <groupId>org.wildfly</groupId>
-          <artifactId>wildfly-arquillian-container-embedded</artifactId>
+          <artifactId>wildfly-arquillian-container-managed</artifactId>
           <version>${wildfly.version}</version>
           <scope>test</scope>
           <exclusions>
@@ -1226,12 +1225,6 @@
             </exclusion>
           </exclusions>
         </dependency>
-        <dependency>
-          <groupId>org.wildfly</groupId>
-          <artifactId>wildfly-embedded</artifactId>
-          <version>${wildfly.version}</version>
-          <scope>test</scope>
-        </dependency>
       </dependencies>
     </profile>
 
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
index 1e0c8a28c2..42a7244868 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -150,7 +150,7 @@
             <password>sa</password>
           </security>
         </datasource>
-        <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="false" use-java-context="true">
+        <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true">
           <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
           <driver>h2</driver>
           <security>