diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 707a44e579..bd7b4bf2ce 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -239,13 +239,6 @@ processTestResources {
 test.dependsOn ":hibernate-orm-modules:prepareWildFlyForTests"
 
 test {
-    doFirst {
-        copy {
-            file("${rootProject.buildDir.absolutePath}/wildfly-${wildflyVersion}/modules/system/layers/base/javax/persistence/api/main/module.xml").delete()
-            from "${projectDir}/../hibernate-orm-modules/src/test/resources/wildfly/module.xml"
-            into "${rootProject.buildDir.absolutePath}/wildfly-${wildflyVersion}/modules/system/layers/base/javax/persistence/api/main"
-        }
-    }
     systemProperty "file.encoding", "utf-8"
     beforeTest { descriptor ->
         //println "Starting test: " + descriptor
diff --git a/hibernate-orm-modules/hibernate-orm-modules.gradle b/hibernate-orm-modules/hibernate-orm-modules.gradle
index 7cd7eae162..6c2772426e 100644
--- a/hibernate-orm-modules/hibernate-orm-modules.gradle
+++ b/hibernate-orm-modules/hibernate-orm-modules.gradle
@@ -53,14 +53,12 @@ configurations {
 
     wildflyDist
     byteBuddy
-    jpa
 }
 
 dependencies {
     jipijapa "org.wildfly:jipijapa-hibernate5:${wildflyVersion}"
     wildflyDist "org.wildfly:wildfly-dist:${wildflyVersion}@zip"
     byteBuddy libraries.byteBuddy
-    jpa libraries.jpa
 
     testCompile project( ":hibernate-core" )
     testCompile project( ":hibernate-envers" )
@@ -187,12 +185,7 @@ task installHibernateModule( type:Copy, dependsOn: [createModulesZip, installWil
     into "${wildFlyInstallDir}/modules"
 }
 
-task copyJpaLib(type: Copy) {
-    into "$wildFlyInstallDir/modules/system/layers/base/javax/persistence/api/main"
-    from configurations.jpa
-}
-
-task prepareWildFlyForTests( dependsOn: [installWildFly, installHibernateModule, copyJpaLib] )
+task prepareWildFlyForTests( dependsOn: [installWildFly, installHibernateModule] )
 
 test.dependsOn prepareWildFlyForTests
 
@@ -200,14 +193,4 @@ processTestResources {
     expand( wildFlyInstallDir: wildFlyInstallDir, arquillianDeploymentExportDir: "${rootProject.buildDir.absolutePath}/arquillian-deployments" )
 }
 
-test {
-    doFirst {
-        copy {
-            file("$wildFlyInstallDir/modules/system/layers/base/javax/persistence/api/main/module.xml").delete()
-            from "${projectDir}/src/test/resources/wildfly/module.xml"
-            into "$wildFlyInstallDir/modules/system/layers/base/javax/persistence/api/main"
-        }
-    }
-}
-
 
diff --git a/hibernate-orm-modules/src/test/resources/module.xml b/hibernate-orm-modules/src/test/resources/module.xml
deleted file mode 100644
index 16ed7f4417..0000000000
--- a/hibernate-orm-modules/src/test/resources/module.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
-<module xmlns="urn:jboss:module:1.5" name="javax.persistence.api">
-    <dependencies>
-        <!-- PersistenceUnitInfo needs javax.sql.DataSource -->
-        <module name="javax.api" export="true"/>
-    </dependencies>
-
-    <resources>
-        <resource-root path="javax.persistence-api-2.2.jar"/>
-    </resources>
-</module>
diff --git a/hibernate-orm-modules/src/test/resources/wildfly/module.xml b/hibernate-orm-modules/src/test/resources/wildfly/module.xml
deleted file mode 100644
index 16ed7f4417..0000000000
--- a/hibernate-orm-modules/src/test/resources/wildfly/module.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ JBoss, Home of Professional Open Source.
-  ~ Copyright 2010, Red Hat, Inc., and individual contributors
-  ~ as indicated by the @author tags. See the copyright.txt file in the
-  ~ distribution for a full listing of individual contributors.
-  ~
-  ~ This is free software; you can redistribute it and/or modify it
-  ~ under the terms of the GNU Lesser General Public License as
-  ~ published by the Free Software Foundation; either version 2.1 of
-  ~ the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  ~ Lesser General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU Lesser General Public
-  ~ License along with this software; if not, write to the Free
-  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  -->
-
-<module xmlns="urn:jboss:module:1.5" name="javax.persistence.api">
-    <dependencies>
-        <!-- PersistenceUnitInfo needs javax.sql.DataSource -->
-        <module name="javax.api" export="true"/>
-    </dependencies>
-
-    <resources>
-        <resource-root path="javax.persistence-api-2.2.jar"/>
-    </resources>
-</module>