diff --git a/deltaspike/modules/data/pom.xml b/deltaspike/modules/data/pom.xml
index ae50262..770146f 100755
--- a/deltaspike/modules/data/pom.xml
+++ b/deltaspike/modules/data/pom.xml
@@ -33,6 +33,7 @@
     <modules>
         <module>api</module>
         <module>impl</module>
+        <module>test-ee7</module>
     </modules>
 
     <properties>
@@ -59,19 +60,5 @@
 
         </dependencies>
     </dependencyManagement>
-    <profiles>
-        <profile>
-            <id>ee7-tests</id>
-            <activation>
-                <property>
-                    <name>wildfly.version</name>
-                    <value>10.1.0.Final</value>
-                </property>
-            </activation>
-            <modules>
-                <module>test-ee7</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
 
diff --git a/deltaspike/modules/data/test-ee7/pom.xml b/deltaspike/modules/data/test-ee7/pom.xml
index db751a8..9c567bd 100644
--- a/deltaspike/modules/data/test-ee7/pom.xml
+++ b/deltaspike/modules/data/test-ee7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.deltaspike.modules</groupId>
         <artifactId>data-module-project</artifactId>
-        <version>1.9.1-SNAPSHOT</version>
+        <version>1.9.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>deltaspike-data-module-test-ee7</artifactId>
@@ -33,6 +33,7 @@
 
     <properties>
         <deploy.skip>true</deploy.skip>
+        <maven.test.skip>true</maven.test.skip>
     </properties>
 
     <build>
@@ -56,33 +57,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <version>2.0.7</version>
-                <executions>
-                    <execution>
-                        <id>process-test</id>
-                        <goals>
-                            <goal>process-test</goal>
-                        </goals>
-                        <phase>generate-test-sources</phase>
-                    </execution>
-                </executions>
-                <configuration>
-                    <processors>
-                        <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
-                    </processors>
-                </configuration>
-                <dependencies>
-                    <!-- this part of Hibernate is Apache License 2.0, thus O.K. for us. -->
-                    <dependency>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate-jpamodelgen</artifactId>
-                        <version>1.2.0.Final</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
         </plugins>
     </build>
 
@@ -150,6 +124,47 @@
 
     <profiles>
         <profile>
+            <!-- This is the profile you need to activate to run EE7 tests at all-->
+            <id>ee7-tests</id>
+
+            <properties>
+                <maven.test.skip>false</maven.test.skip>
+            </properties>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.bsc.maven</groupId>
+                        <artifactId>maven-processor-plugin</artifactId>
+                        <version>2.0.7</version>
+                        <executions>
+                            <execution>
+                                <id>process-test</id>
+                                <goals>
+                                    <goal>process-test</goal>
+                                </goals>
+                                <phase>generate-test-sources</phase>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <processors>
+                                <processor>org.hibernate.jpamodelgen.JPAMetaModelEntityProcessor</processor>
+                            </processors>
+                        </configuration>
+                        <dependencies>
+                            <!-- this part of Hibernate is Apache License 2.0, thus O.K. for us. -->
+                            <dependency>
+                                <groupId>org.hibernate</groupId>
+                                <artifactId>hibernate-jpamodelgen</artifactId>
+                                <version>1.2.0.Final</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
             <id>wildfly-build-managed</id>
             <build>
                 <testResources>