diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index e67965536..c0c19a3ff 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -407,21 +407,18 @@
             <id>wildfly-managed-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha9</version>
                 </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
@@ -493,22 +490,19 @@
             <id>wildfly-managed-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha8</version>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
@@ -579,21 +573,18 @@
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha9</version>
                 </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
@@ -665,22 +656,19 @@
             <id>wildfly-remote-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha8</version>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index d85b96985..af3789d44 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -312,7 +312,7 @@
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <executions>
@@ -330,7 +330,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <groupId>de.jpdigital</groupId>
                 <artifactId>hibernate50-ddl-maven-plugin</artifactId>
@@ -450,11 +450,11 @@
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.9</version>
-            </plugin>
+            </plugin>-->
             
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -835,7 +835,7 @@
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
+                <!--<dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
                     <scope>test</scope>
@@ -843,8 +843,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha9</version>
-                </dependency>
+                </dependency>-->
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
@@ -917,11 +916,11 @@
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
+                <!--<dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
                     <scope>test</scope>
-                </dependency>
+                </dependency>-->
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
@@ -990,11 +989,11 @@
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
+                <!--<dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
                     <scope>test</scope>
@@ -1002,8 +1001,7 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha9</version>
-                </dependency>
+                </dependency>-->
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
@@ -1072,15 +1070,15 @@
             <id>wildfly-remote-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                     <scope>test</scope>
                 </dependency>
-                <dependency>
+                <!--<dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
                     <scope>test</scope>
-                </dependency>
+                </dependency>-->
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index f4c0a2f2c..57aca0506 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -313,7 +313,7 @@
             <id>wildfly-managed-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                     <scope>test</scope>
                 </dependency>
@@ -393,7 +393,7 @@
             <id>wildfly-managed-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                     <scope>test</scope>
                 </dependency>
@@ -473,7 +473,7 @@
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                     <scope>test</scope>
                 </dependency>
@@ -553,7 +553,7 @@
             <id>wildfly-remote-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                     <scope>test</scope>
                 </dependency>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 59d43f3ba..f37a7d774 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -357,7 +357,7 @@
             <id>wildfly-managed-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                     <scope>test</scope>
                 </dependency>
@@ -374,7 +374,6 @@
                 <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha8</version>
                 </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
@@ -446,22 +445,19 @@
             <id>wildfly-managed-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha8</version>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
@@ -532,7 +528,7 @@
             <id>wildfly-remote-h2-mem</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
                     <scope>test</scope>
                 </dependency>
@@ -620,22 +616,19 @@
             <id>wildfly-remote-pgsql</id>
             <dependencies>
                 <dependency>
-                    <groupId>org.wildfly</groupId>
+                    <groupId>org.wildfly.arquillian</groupId>
                     <artifactId>wildfly-arquillian-container-remote</artifactId>
-                    <!--<version>8.2.1.Final</version>-->
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.jacoco</groupId>
                     <artifactId>org.jacoco.core</artifactId>
-                    <!--<version>0.7.5.201505241946</version>-->
                     <scope>test</scope>
                 </dependency>
-                <!--<dependency>
+                <dependency>
                     <groupId>org.jboss.arquillian.extension</groupId>
                     <artifactId>arquillian-jacoco</artifactId>
-                    <version>1.0.0.Alpha8</version>
-                </dependency>-->
+                </dependency>
                 <dependency>
                     <groupId>net.sf.saxon</groupId>
                     <artifactId>Saxon-HE</artifactId>
diff --git a/pom.xml b/pom.xml
index 229e26243..41f0acd25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -692,14 +692,14 @@
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
-                <version>1.1.12.Final</version>
+                <version>1.4.0.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-transaction-bom</artifactId>
-                <version>1.0.3.Final</version>
+                <version>1.0.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -713,12 +713,6 @@
                 <artifactId>arquillian-jacoco</artifactId>
                 <version>1.0.0.Alpha9</version>
             </dependency>
-            <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-arquillian-container-managed</artifactId>
-                <version>8.2.1.Final</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-managed</artifactId>
@@ -726,9 +720,9 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>org.wildfly</groupId>
+                <groupId>org.wildfly.arquillian</groupId>
                 <artifactId>wildfly-arquillian-container-remote</artifactId>
-                <version>8.2.1.Final</version>
+                <version>2.1.0.Final</version>
                 <scope>test</scope>
             </dependency>
 
@@ -738,7 +732,7 @@
             <dependency>
                 <groupId>org.jacoco</groupId>
                 <artifactId>org.jacoco.core</artifactId>
-                <version>0.7.9</version>
+                <version>0.8.0</version>
                 <scope>test</scope>
             </dependency>