diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 536ac1573..aa16f3649 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -61,6 +61,26 @@
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-search-orm</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-xml-provider</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java
index d69750125..980594955 100644
--- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java
+++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutManagerIT.java
@@ -62,9 +62,9 @@ import static org.junit.Assert.*;
 @Transactional(TransactionMode.COMMIT)
 @CreateSchema(
     {
-    "001_create_schema.sql",
-    "002_create_ccm_shortcuts_tables.sql",
-    "003_init_hibernate_sequence.sql"
+        "001_create_schema.sql",
+        "002_create_ccm_shortcuts_tables.sql",
+        "003_init_hibernate_sequence.sql"
     }
 )
 @CleanupUsingScript(value = {"999_cleanup.sql"},
@@ -107,7 +107,27 @@ public class ShortcutManagerIT {
         return ShrinkWrap.create(
             WebArchive.class,
             "LibreCCM-org.libreccm.shortcuts.ShortcutTest-web.war")
-            .addPackages(true, "com.arsdigita", "org.libreccm")
+            .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
+            .addPackage(org.libreccm.categorization.Categorization.class
+                .getPackage())
+            .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
+            .addPackage(org.libreccm.configuration.Configuration.class
+                .getPackage())
+            .addPackage(org.libreccm.core.CcmCore.class.getPackage())
+            .addPackage(org.libreccm.jpa.EntityManagerProducer.class
+                .getPackage())
+            .addPackage(org.libreccm.l10n.LocalizedString.class
+                .getPackage())
+            .addPackage(org.libreccm.security.Permission.class.getPackage())
+            .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
+            .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            .addClass(com.arsdigita.kernel.KernelConfig.class)
+            .addClass(org.libreccm.imexport.Exportable.class)
+            .addClass(org.libreccm.shortcuts.Shortcut.class)
+            .addClass(org.libreccm.shortcuts.ShortcutManager.class)
+            .addClass(org.libreccm.shortcuts.ShortcutRepository.class)
             .addAsLibraries(getModuleDependencies())
             .addAsLibraries(getCcmCoreDependencies())
             .addAsResource("configs/shiro.ini", "shiro.ini")
diff --git a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java
index 86b14441f..16e38124d 100644
--- a/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java
+++ b/ccm-shortcuts/src/test/java/org/libreccm/shortcuts/ShortcutRepositoryIT.java
@@ -19,6 +19,7 @@
 package org.libreccm.shortcuts;
 
 import static org.libreccm.testutils.DependenciesHelpers.getCcmCoreDependencies;
+import static org.libreccm.testutils.DependenciesHelpers.getModuleDependencies;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
@@ -105,8 +106,25 @@ public class ShortcutRepositoryIT {
                 WebArchive.class,
                 "LibreCCM-org.libreccm.shortcuts.ShortcutRepositoryTest-web.war"
             )
-            .addPackages(true, "com.arsdigita", "org.libreccm")
-            //.addAsLibraries(getModuleDependencies())
+            .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
+            .addPackage(org.libreccm.categorization.Categorization.class
+                .getPackage())
+            .addPackage(org.libreccm.configuration.Configuration.class
+                .getPackage())
+            .addPackage(org.libreccm.core.CcmCore.class.getPackage())
+            .addPackage(org.libreccm.jpa.EntityManagerProducer.class
+                .getPackage())
+            .addPackage(org.libreccm.l10n.LocalizedString.class
+                .getPackage())
+            .addPackage(org.libreccm.security.Permission.class.getPackage())
+            .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
+            .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            .addClass(org.libreccm.imexport.Exportable.class)
+            .addClass(org.libreccm.shortcuts.Shortcut.class)
+            .addClass(org.libreccm.shortcuts.ShortcutRepository.class)
+            .addAsLibraries(getModuleDependencies())
             .addAsLibraries(getCcmCoreDependencies())
             .addAsResource(
                 "test-persistence.xml", "META-INF/persistence.xml"
diff --git a/ccm-shortcuts/src/test/resources/application.xml.off b/ccm-shortcuts/src/test/resources/application.xml.off
deleted file mode 100644
index 10dae5667..000000000
--- a/ccm-shortcuts/src/test/resources/application.xml.off
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd" version="7">
-  <display-name>ccm-bundle-shortcuts-test-wildfly</display-name>
-  <module>
-    <web>
-      <web-uri>LibreCCM-org.libreccm.shortcuts.ShortcutTest-web.war</web-uri>
-      <context-root>/libreccm-shortcuts-test</context-root>
-    </web>
-  </module>
-  <library-directory>lib</library-directory>
-</application>
diff --git a/ccm-shortcuts/src/test/resources/test-beans.xml.off b/ccm-shortcuts/src/test/resources/test-beans.xml.off
deleted file mode 100644
index d45765d18..000000000
--- a/ccm-shortcuts/src/test/resources/test-beans.xml.off
+++ /dev/null
@@ -1,11 +0,0 @@
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
-                           http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-       bean-discovery-mode="annotated">
-       
-        <interceptors>
-            <class>org.libreccm.security.AuthorizationInterceptor</class>
-        </interceptors>
-    
-</beans>