diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 9d770cbe7..e48cc9fa4 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -253,11 +253,6 @@
     <profiles>
         <profile>
             <id>setup-runtime</id>
-            <!--            <properties>
-                <libreccm.datasource.connectionUrl>jdbc:postgresql://localhost:5432/ccm-devel</libreccm.datasource.connectionUrl>
-                <libreccm.datasource.username>ccm</libreccm.datasource.username>
-                <libreccm.datasource.password>ccm</libreccm.datasource.password>
-            </properties>-->
             <dependencies>
                 <dependency>
                     <groupId>org.postgresql</groupId>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 8c09637e8..85083180e 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -936,6 +936,124 @@
                 </plugins>
             </build>
         </profile>
+        
+        <profile>
+            <id>test-with-wildfly</id>
+            <dependencies>
+                <dependency>
+                    <groupId>org.wildfly.arquillian</groupId>
+                    <artifactId>wildfly-arquillian-container-remote</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>net.sf.saxon</groupId>
+                    <artifactId>Saxon-HE</artifactId>
+                </dependency>
+            </dependencies>
+            
+            <build>
+                <testResources>
+                    <testResource>
+                        <directory>src/test/resources</directory>
+                    </testResource>
+                    <testResource>
+                        <directory>src/test/resources-wildfly-remote-h2-mem</directory>
+                    </testResource>
+                    <testResource>
+                        <directory>${project.build.directory}/generated-resources</directory>
+                    </testResource>
+                    
+                </testResources>
+            
+                <plugins>
+                    <plugin>
+                        <groupId>de.jpdigital</groupId>
+                        <artifactId>hibernate53-ddl-maven-plugin</artifactId>
+                        <configuration>
+                            <dialects>
+                                <param>h2</param>
+                                <param>postgresql9</param>
+                            </dialects>
+                            <packages>
+                                <param>org.libreccm</param>
+                            </packages>
+                            <useEnvers>true</useEnvers>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>gen-ddl</goal>
+                                </goals>
+                                <phase>process-classes</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <forkMode>always</forkMode>
+                            <forkCount>999</forkCount>
+                            <reuseForks>true</reuseForks>
+                            <systemPropertyVariables>
+                                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                            </systemPropertyVariables>
+                            <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                            <groups>
+                                org.libreccm.tests.categories.UnitTest,
+                                org.libreccm.tests.categories.IntegrationTest
+                            </groups>
+                            <trimStackTrace>false</trimStackTrace>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.wildfly.plugins</groupId>
+                        <artifactId>wildfly-maven-plugin</artifactId>
+                        <configuration>
+                            <skip>false</skip>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>start-test-env</id>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                                <phase>pre-integration-test</phase>
+                                <configuration>
+                                    <stdout>System.out</stdout>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>prepare-test-env</id>
+                                <goals>
+                                    <goal>add-resource</goal>
+                                </goals>
+                                <phase>pre-integration-test</phase>
+                                <configuration>
+                                    <address>subsystem=datasources,data-source=ccm-core-testdb-h2-mem</address>
+                                    <force>true</force>
+                                <resources>
+                                    
+                                    <resource>
+                                        <properties>
+                                            <connection-url>jdbc:h2:mem:ccm-core-testdb</connection-url>
+                                            <jndi-name>jndi-name="java:/comp/env/jdbc/org/libreccm/ccm-core/h2-mem</jndi-name>
+                                            <enabled>true</enabled>
+                                            <user-name>sa</user-name>
+                                            <password>sa</password>
+                                            <use-ccm>false</use-ccm>
+                                            <driver-name>h2</driver-name>
+                                        </properties>
+                                    </resource>
+                                </resources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+            
+        </profile>
                 
         <profile>
             <id>wildfly-remote-h2-mem</id>