diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle
index e171c6e5ad..40bacce422 100644
--- a/hibernate-c3p0/hibernate-c3p0.gradle
+++ b/hibernate-c3p0/hibernate-c3p0.gradle
@@ -7,7 +7,7 @@ dependencies {
         // for test runtime
         transitive = true
     }
-    testCompile project( ':hibernate-testing' )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
 }
 
 def pomName() {
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index b37a93b401..14f6c16925 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -23,7 +23,6 @@ dependencies {
     provided( libraries.validation )
     provided( libraries.classmate )
 
-    testCompile( project(':hibernate-testing') )
     testCompile( libraries.validation )
     testCompile( libraries.jandex )
     testCompile( libraries.classmate )
@@ -35,6 +34,13 @@ dependencies {
     // for testing stored procedure support
     testCompile( libraries.derby )
 
+	testCompile( libraries.byteman )
+	testCompile( libraries.byteman_install )
+	testCompile( libraries.byteman_bmunit )
+	testCompile( libraries.xapool )
+	testCompile ( libraries.jboss_jta ) {
+		transitive=false;
+	}
 
     testRuntime( 'jaxen:jaxen:1.1' )
     testRuntime( libraries.javassist )
@@ -165,3 +171,34 @@ generateSources.dependsOn generateGrammarSource
 compileJava.dependsOn jaxb
 
 
+// create the testing jar
+task testingJar(type: Jar, dependsOn: compileTestJava) {
+	from sourceSets.test.output
+	// atm none of these work, the jar includes everything from sourceSets.test.output
+	include '**/org/hibernate/testing/**'
+	include '**/org/hibernate/testing/*'
+	include 'org/hibernate/testing/**'
+	include 'org/hibernate/testing/*'
+	classifier = 'testing'
+}
+
+// allow other modules to use it
+configurations {
+	testing {
+		extendsFrom testCompile
+	}
+}
+artifacts {
+	testing testingJar
+}
+
+// publish it so other projects can use it
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			artifact testingJar {
+				classifier "testing"
+			}
+		}
+	}
+}
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java b/hibernate-core/src/test/java/org/hibernate/testing/AfterClassOnce.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/AfterClassOnce.java
rename to hibernate-core/src/test/java/org/hibernate/testing/AfterClassOnce.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java b/hibernate-core/src/test/java/org/hibernate/testing/BeforeClassOnce.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/BeforeClassOnce.java
rename to hibernate-core/src/test/java/org/hibernate/testing/BeforeClassOnce.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java b/hibernate-core/src/test/java/org/hibernate/testing/DialectCheck.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/DialectCheck.java
rename to hibernate-core/src/test/java/org/hibernate/testing/DialectCheck.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java b/hibernate-core/src/test/java/org/hibernate/testing/DialectChecks.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
rename to hibernate-core/src/test/java/org/hibernate/testing/DialectChecks.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java b/hibernate-core/src/test/java/org/hibernate/testing/FailureExpected.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/FailureExpected.java
rename to hibernate-core/src/test/java/org/hibernate/testing/FailureExpected.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java b/hibernate-core/src/test/java/org/hibernate/testing/OnExpectedFailure.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/OnExpectedFailure.java
rename to hibernate-core/src/test/java/org/hibernate/testing/OnExpectedFailure.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java b/hibernate-core/src/test/java/org/hibernate/testing/OnFailure.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/OnFailure.java
rename to hibernate-core/src/test/java/org/hibernate/testing/OnFailure.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java b/hibernate-core/src/test/java/org/hibernate/testing/RequiresDialect.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialect.java
rename to hibernate-core/src/test/java/org/hibernate/testing/RequiresDialect.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java b/hibernate-core/src/test/java/org/hibernate/testing/RequiresDialectFeature.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialectFeature.java
rename to hibernate-core/src/test/java/org/hibernate/testing/RequiresDialectFeature.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java b/hibernate-core/src/test/java/org/hibernate/testing/RequiresDialects.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/RequiresDialects.java
rename to hibernate-core/src/test/java/org/hibernate/testing/RequiresDialects.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java b/hibernate-core/src/test/java/org/hibernate/testing/ServiceRegistryBuilder.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/ServiceRegistryBuilder.java
rename to hibernate-core/src/test/java/org/hibernate/testing/ServiceRegistryBuilder.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/Skip.java b/hibernate-core/src/test/java/org/hibernate/testing/Skip.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/Skip.java
rename to hibernate-core/src/test/java/org/hibernate/testing/Skip.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java b/hibernate-core/src/test/java/org/hibernate/testing/SkipForDialect.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialect.java
rename to hibernate-core/src/test/java/org/hibernate/testing/SkipForDialect.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java b/hibernate-core/src/test/java/org/hibernate/testing/SkipForDialects.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/SkipForDialects.java
rename to hibernate-core/src/test/java/org/hibernate/testing/SkipForDialects.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java b/hibernate-core/src/test/java/org/hibernate/testing/SkipLog.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/SkipLog.java
rename to hibernate-core/src/test/java/org/hibernate/testing/SkipLog.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java b/hibernate-core/src/test/java/org/hibernate/testing/TestForIssue.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/TestForIssue.java
rename to hibernate-core/src/test/java/org/hibernate/testing/TestForIssue.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/async/Executable.java b/hibernate-core/src/test/java/org/hibernate/testing/async/Executable.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/async/Executable.java
rename to hibernate-core/src/test/java/org/hibernate/testing/async/Executable.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/async/ExecutableAdapter.java b/hibernate-core/src/test/java/org/hibernate/testing/async/ExecutableAdapter.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/async/ExecutableAdapter.java
rename to hibernate-core/src/test/java/org/hibernate/testing/async/ExecutableAdapter.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/async/TimedExecutor.java b/hibernate-core/src/test/java/org/hibernate/testing/async/TimedExecutor.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/async/TimedExecutor.java
rename to hibernate-core/src/test/java/org/hibernate/testing/async/TimedExecutor.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/byteman/BytemanHelper.java b/hibernate-core/src/test/java/org/hibernate/testing/byteman/BytemanHelper.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/byteman/BytemanHelper.java
rename to hibernate-core/src/test/java/org/hibernate/testing/byteman/BytemanHelper.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/AbstractReadWriteAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/AbstractReadWriteAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/AbstractReadWriteAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/AbstractReadWriteAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseCollectionRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseCollectionRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseCollectionRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseCollectionRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseEntityRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseGeneralDataRegion.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseNaturalIdRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegion.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseRegion.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegion.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseRegion.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseTransactionalDataRegion.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/BaseTransactionalDataRegion.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/BaseTransactionalDataRegion.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/BaseTransactionalDataRegion.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/CachingRegionFactory.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/CachingRegionFactory.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/CachingRegionFactory.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/CollectionRegionImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/CollectionRegionImpl.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/CollectionRegionImpl.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/CollectionRegionImpl.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/EntityRegionImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/EntityRegionImpl.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/EntityRegionImpl.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/EntityRegionImpl.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/NaturalIdRegionImpl.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteCollectionRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteEntityRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java
similarity index 80%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java
index 3de694f7d6..ca7dc6153b 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java
+++ b/hibernate-core/src/test/java/org/hibernate/testing/cache/NonstrictReadWriteNaturalIdRegionAccessStrategy.java
@@ -44,8 +44,9 @@ class NonstrictReadWriteNaturalIdRegionAccessStrategy extends BaseNaturalIdRegio
 	}
 	
 	/**
-	 * Returns <code>false</code> since this is an asynchronous cache access strategy.
-	 * @see org.hibernate.cache.ehcache.internal.strategy.NonStrictReadWriteEhcacheNaturalIdRegionAccessStrategy 
+	 * Returns {@code false} since this is an asynchronous cache access strategy.
+	 *
+	 * {@inheritDoc}
 	 */
 	@Override
 	public boolean insert(Object key, Object value ) throws CacheException {
@@ -53,8 +54,9 @@ class NonstrictReadWriteNaturalIdRegionAccessStrategy extends BaseNaturalIdRegio
 	}
 
 	/**
-	 * Returns <code>false</code> since this is a non-strict read/write cache access strategy
-	 * @see org.hibernate.cache.ehcache.internal.strategy.NonStrictReadWriteEhcacheNaturalIdRegionAccessStrategy 
+	 * Returns {@code false} since this is a non-strict read/write cache access strategy
+	 *
+	 * {@inheritDoc}
 	 */
 	@Override
 	public boolean afterInsert(Object key, Object value ) throws CacheException {
@@ -63,7 +65,8 @@ class NonstrictReadWriteNaturalIdRegionAccessStrategy extends BaseNaturalIdRegio
 	
 	/**
 	 * Removes the entry since this is a non-strict read/write cache strategy.
-	 * @see org.hibernate.cache.ehcache.internal.strategy.NonStrictReadWriteEhcacheNaturalIdRegionAccessStrategy 
+	 *
+	 * {@inheritDoc}
 	 */
 	public boolean update(Object key, Object value ) throws CacheException {
 		remove( key );
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyCollectionRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/ReadOnlyCollectionRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyCollectionRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/ReadOnlyCollectionRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyEntityRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/ReadOnlyEntityRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyEntityRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/ReadOnlyEntityRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyNaturalIdRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/ReadOnlyNaturalIdRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadOnlyNaturalIdRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/ReadOnlyNaturalIdRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteCollectionRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/ReadWriteCollectionRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteCollectionRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/ReadWriteCollectionRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteEntityRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/ReadWriteEntityRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteEntityRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/ReadWriteEntityRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteNaturalIdRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/ReadWriteNaturalIdRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/ReadWriteNaturalIdRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/ReadWriteNaturalIdRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/Timestamper.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/Timestamper.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/Timestamper.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/Timestamper.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/TransactionalCollectionRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalEntityRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/TransactionalEntityRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalEntityRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/TransactionalEntityRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalNaturalIdRegionAccessStrategy.java b/hibernate-core/src/test/java/org/hibernate/testing/cache/TransactionalNaturalIdRegionAccessStrategy.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/cache/TransactionalNaturalIdRegionAccessStrategy.java
rename to hibernate-core/src/test/java/org/hibernate/testing/cache/TransactionalNaturalIdRegionAccessStrategy.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java b/hibernate-core/src/test/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
rename to hibernate-core/src/test/java/org/hibernate/testing/env/ConnectionProviderBuilder.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java b/hibernate-core/src/test/java/org/hibernate/testing/env/TestingDatabaseInfo.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/env/TestingDatabaseInfo.java
rename to hibernate-core/src/test/java/org/hibernate/testing/env/TestingDatabaseInfo.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
rename to hibernate-core/src/test/java/org/hibernate/testing/jta/JtaAwareConnectionProviderImpl.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java b/hibernate-core/src/test/java/org/hibernate/testing/jta/TestingJtaBootstrap.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaBootstrap.java
rename to hibernate-core/src/test/java/org/hibernate/testing/jta/TestingJtaBootstrap.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java b/hibernate-core/src/test/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
rename to hibernate-core/src/test/java/org/hibernate/testing/jta/TestingJtaPlatformImpl.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/AfterClassCallbackHandler.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/BaseCoreFunctionalTestCase.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/BeforeClassCallbackHandler.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CallbackException.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/CallbackException.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/CallbackException.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/CallbackException.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/ClassLoadingIsolater.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/CustomRunner.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/CustomRunner.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/ExtendedFrameworkMethod.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/ExtraAssertions.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/ExtraAssertions.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/ExtraAssertions.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/FailureExpectedHandler.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/FailureExpectedHandler.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/FailureExpectedHandler.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/Helper.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/Helper.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/Helper.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/InvalidMethodForAnnotationException.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java b/hibernate-core/src/test/java/org/hibernate/testing/junit4/TestClassMetadata.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/junit4/TestClassMetadata.java
rename to hibernate-core/src/test/java/org/hibernate/testing/junit4/TestClassMetadata.java
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/util/TestPathHelper.java b/hibernate-core/src/test/java/org/hibernate/testing/util/TestPathHelper.java
similarity index 100%
rename from hibernate-testing/src/main/java/org/hibernate/testing/util/TestPathHelper.java
rename to hibernate-core/src/test/java/org/hibernate/testing/util/TestPathHelper.java
diff --git a/hibernate-ehcache/hibernate-ehcache.gradle b/hibernate-ehcache/hibernate-ehcache.gradle
index dae140df17..f6dc9c63ed 100644
--- a/hibernate-ehcache/hibernate-ehcache.gradle
+++ b/hibernate-ehcache/hibernate-ehcache.gradle
@@ -2,7 +2,7 @@ dependencies {
     compile project( ':hibernate-core' )
     compile( libraries.ehcache )
 
-    testCompile project( ':hibernate-testing' )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
 }
 
 def pomName() {
diff --git a/hibernate-entitymanager/hibernate-entitymanager.gradle b/hibernate-entitymanager/hibernate-entitymanager.gradle
index fbc6697572..adaae7764e 100644
--- a/hibernate-entitymanager/hibernate-entitymanager.gradle
+++ b/hibernate-entitymanager/hibernate-entitymanager.gradle
@@ -18,8 +18,8 @@ dependencies {
 
     provided( "javax.enterprise:cdi-api:1.1-PFD" )
 
-    testCompile( project(':hibernate-testing') )
-    testCompile( libraries.shrinkwrap_api )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
+	testCompile( libraries.shrinkwrap_api )
     testCompile( libraries.shrinkwrap )
     testCompile( libraries.validation )
     testCompile( "org.jboss.weld:weld-core:2.0.0.Beta6" )
diff --git a/hibernate-envers/hibernate-envers.gradle b/hibernate-envers/hibernate-envers.gradle
index 373e4c53ca..beccd59b8a 100644
--- a/hibernate-envers/hibernate-envers.gradle
+++ b/hibernate-envers/hibernate-envers.gradle
@@ -13,8 +13,8 @@ dependencies {
     provided( [group: 'org.hibernate', name: 'hibernate-tools', version: '3.2.0.ga'] )
     provided( libraries.ant )
 
-    testCompile( project(':hibernate-testing') )
-    testCompile( project(path: ':hibernate-entitymanager', configuration: 'tests') )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
+    testCompile( project( path: ':hibernate-entitymanager', configuration: 'tests' ) )
 
     testRuntime( libraries.javassist )
 
diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle
index 7362c73442..a0b1f45a43 100644
--- a/hibernate-infinispan/hibernate-infinispan.gradle
+++ b/hibernate-infinispan/hibernate-infinispan.gradle
@@ -7,7 +7,7 @@ dependencies {
     compile( libraries.infinispan )
     compile( libraries.rhq )
 
-    testCompile project( ':hibernate-testing' )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
     testCompile( libraries.infinispan_test )
     testCompile( libraries.jboss_common_core )
     testCompile( libraries.jnp_client )
diff --git a/hibernate-proxool/hibernate-proxool.gradle b/hibernate-proxool/hibernate-proxool.gradle
index 08dbfd402c..06e2e67608 100644
--- a/hibernate-proxool/hibernate-proxool.gradle
+++ b/hibernate-proxool/hibernate-proxool.gradle
@@ -1,7 +1,7 @@
 dependencies {
     compile project( ':hibernate-core' )
     compile( libraries.proxool )
-    testCompile project( ':hibernate-testing' )
+	testCompile( project( path: ':hibernate-core', configuration: 'testing' ) )
 }
 
 def pomName() {
diff --git a/settings.gradle b/settings.gradle
index 2a76c5c79f..2fc768de59 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,4 @@
 include 'hibernate-core'
-include 'hibernate-testing'
 include 'hibernate-entitymanager'
 include 'hibernate-envers'