diff --git a/build.gradle b/build.gradle
index 8f00a9ba56..5daeda86f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -84,7 +84,6 @@ libraries = [
 
         // logging
         logging:        'org.jboss.logging:jboss-logging:3.1.0.CR1',
-        logging_generator:  'org.jboss.logging:jboss-logging-generator:1.0.0.CR4',
         logging_processor:  'org.jboss.logging:jboss-logging-processor:1.0.0.CR4',
         slf4j_api:      'org.slf4j:slf4j-api:' + slf4jVersion,
         slf4j_log4j12:  'org.slf4j:slf4j-log4j12:' + slf4jVersion,
@@ -146,7 +145,6 @@ subprojects { subProject ->
             testRuntime( libraries.jcl )
             testRuntime( libraries.javassist )
             testRuntime( libraries.h2 )
-            jbossLoggingTool( libraries.logging_generator )
             jbossLoggingTool( libraries.logging_processor )
             hibernateJpaModelGenTool( libraries.jpa_modelgen )
             jaxb( libraries.jaxb )
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index 4c63c3dca6..589e819170 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -9,7 +9,9 @@ dependencies {
     compile( libraries.dom4j ) {
         transitive = false
     }
-    compile( libraries.commons_annotations )
+    compile( libraries.commons_annotations ) {
+        transitive = false
+    }
     compile( libraries.jandex )
     compile( libraries.classmate )
     compile( libraries.jpa )
diff --git a/hibernate-infinispan/hibernate-infinispan.gradle b/hibernate-infinispan/hibernate-infinispan.gradle
index 398f9294af..ced6415102 100644
--- a/hibernate-infinispan/hibernate-infinispan.gradle
+++ b/hibernate-infinispan/hibernate-infinispan.gradle
@@ -31,14 +31,7 @@ dependencies {
    testCompile([group: 'org.jboss', name: 'jboss-common-core', version: '2.2.14.GA'])
    testCompile([group: 'org.jboss.naming', name: 'jnp-client', version: jnpVersion])
    testCompile([group: 'org.jboss.naming', name: 'jnpserver', version: jnpVersion])
-   testCompile([group: 'com.experlog', name: 'xapool', version: '1.5.0'])
-   testCompile([group: 'org.jboss.jbossts', name: 'jbossjta', version: '4.15.1.Final'])
-   testCompile(libraries.jta)
-   testCompile(libraries.h2)
-   // testCompile( [group: 'hsqldb', name: 'hsqldb', version: '1.8.0.2'] )
    testCompile([group: 'org.rhq.helpers', name: 'rhq-pluginAnnotations', version: '1.4.0.B01'])
-   testCompile([group: 'log4j', name: 'log4j', version: '1.2.16'])
-   testRuntime(libraries.javassist)
 }
 
 test {