diff --git a/extensions/geode-modules-session/build.gradle b/extensions/geode-modules-session/build.gradle
index 59f3c72d34ac..55113d221d8c 100644
--- a/extensions/geode-modules-session/build.gradle
+++ b/extensions/geode-modules-session/build.gradle
@@ -21,7 +21,9 @@ dependencies {
   compile(project(':extensions:geode-modules-session-internal'))
   compile(project(':geode-core'))
 
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile('org.httpunit:httpunit:' + project.'httpunit.version') {
     exclude group: 'javax.servlet'
     // this version of httpunit contains very outdated xercesImpl
diff --git a/extensions/geode-modules-test/build.gradle b/extensions/geode-modules-test/build.gradle
index 8c961f1ee185..38d12a063034 100644
--- a/extensions/geode-modules-test/build.gradle
+++ b/extensions/geode-modules-test/build.gradle
@@ -26,7 +26,9 @@ dependencies {
     // Remove everything related to Tomcat 6.x
     exclude group: 'org.apache.tomcat'
   }
-  compile(project(':geode-junit'))
+  compile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   compile('org.httpunit:httpunit:' + project.'httpunit.version') {
     // this version of httpunit contains very outdated xercesImpl
     exclude group: 'xerces'
diff --git a/extensions/geode-modules-tomcat7/build.gradle b/extensions/geode-modules-tomcat7/build.gradle
index 948a7649d064..174557cf1d16 100644
--- a/extensions/geode-modules-tomcat7/build.gradle
+++ b/extensions/geode-modules-tomcat7/build.gradle
@@ -32,7 +32,9 @@ dependencies {
   }
   compile('org.apache.tomcat:tomcat-juli:' + project.'tomcat7.version')
 
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':extensions:geode-modules-test'))
 
   integrationTestRuntime('javax.annotation:jsr250-api:' + project.'javax.jsr250-api.version')
diff --git a/extensions/geode-modules/build.gradle b/extensions/geode-modules/build.gradle
index 8fdf0e9ee9fc..de657c395908 100644
--- a/extensions/geode-modules/build.gradle
+++ b/extensions/geode-modules/build.gradle
@@ -29,7 +29,9 @@ dependencies {
 
   testCompile('org.apache.bcel:bcel:' + project.'bcel.version')
 
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':extensions:geode-modules-test'))
 
   integrationTestRuntime('org.apache.tomcat:coyote:' + project.'tomcat6.version')
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 28c87fd034b0..42a580a1bdd2 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -132,12 +132,18 @@ dependencies {
 
 
   testCompile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
 
 
   integrationTestCompile(project(':geode-core'))
-  integrationTestCompile(project(':geode-junit'))
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':geode-pulse'))
   integrationTestCompile(project(':geode-assembly:geode-assembly-test'))
   integrationTestCompile('org.apache.httpcomponents:httpclient:' + project.'httpclient.version')
@@ -156,11 +162,15 @@ dependencies {
 
 
   acceptanceTestCompile(project(':geode-core'))
-  acceptanceTestCompile(project(':geode-dunit'))
+  acceptanceTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
 
 
   uiTestCompile(project(':geode-core'))
-  uiTestCompile(project(':geode-dunit'))
+  uiTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   uiTestCompile(project(':geode-pulse'))
   uiTestCompile(project(':geode-pulse:geode-pulse-test'))
   uiTestCompile(project(':geode-assembly:geode-assembly-test'))
@@ -173,7 +183,9 @@ dependencies {
 
 
   upgradeTestCompile(project(':geode-core'))
-  upgradeTestCompile(project(':geode-dunit'))
+  upgradeTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   upgradeTestCompile(project(':geode-assembly:geode-assembly-test'))
 
   upgradeTestRuntime(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.3')
diff --git a/geode-common/build.gradle b/geode-common/build.gradle
index 03e2d171420c..e57c7429fec9 100755
--- a/geode-common/build.gradle
+++ b/geode-common/build.gradle
@@ -16,5 +16,7 @@
  */
 
 dependencies {
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
 }
diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
index b99ba40ff551..536de378fa66 100644
--- a/geode-connectors/build.gradle
+++ b/geode-connectors/build.gradle
@@ -27,9 +27,15 @@ repositories {
 dependencies {
   compile(project(':geode-common'))
   compile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
-  integrationTestCompile(project(':geode-dunit'))
-  acceptanceTestCompile(project(':geode-dunit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
+  acceptanceTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
 
   compile(group: 'com.zaxxer', name: 'HikariCP', version: project.'HikariCP.version')
 
diff --git a/geode-core/build.gradle b/geode-core/build.gradle
index 216f5f1b92ba..b6d2a05b9433 100755
--- a/geode-core/build.gradle
+++ b/geode-core/build.gradle
@@ -259,7 +259,9 @@ dependencies {
   jcaCompile(sourceSets.main.output)
 
 
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile(project(':geode-concurrency-test'))
   testCompile('org.apache.bcel:bcel:' + project.'bcel.version')
   testCompile('org.mockito:mockito-core:' + project.'mockito-core.version')
@@ -311,7 +313,9 @@ dependencies {
   }
 
 
-  performanceTestCompile(project(':geode-junit'))
+  performanceTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
 
   // Distributed Tests
   distributedTestCompile(sourceSets.test.output)            // To be removed by GEODE-5803
diff --git a/geode-cq/build.gradle b/geode-cq/build.gradle
index 01b1d8032904..0c9e34e74116 100644
--- a/geode-cq/build.gradle
+++ b/geode-cq/build.gradle
@@ -18,8 +18,12 @@
 dependencies {
   compileOnly(project(':geode-core'))
   testCompile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
-  integrationTestCompile(project(':geode-dunit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   upgradeTestCompile(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
diff --git a/geode-dunit/build.gradle b/geode-dunit/build.gradle
index acdfaa885b44..3fb6ee7b22de 100755
--- a/geode-dunit/build.gradle
+++ b/geode-dunit/build.gradle
@@ -19,7 +19,9 @@ dependencies {
   compile(project(':geode-core'))
   //compileOnly files("${System.getProperty('java.home')}/../lib/tools.jar")
 
-  compile(project(':geode-junit'))
+  compile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   compile(project(':geode-json'))
 
   compile('com.jayway.jsonpath:json-path:' + project.'json-path.version')
diff --git a/geode-dunit/src/test/resources/expected-pom.xml b/geode-dunit/src/test/resources/expected-pom.xml
index cbf83942eafc..e879baa4d627 100644
--- a/geode-dunit/src/test/resources/expected-pom.xml
+++ b/geode-dunit/src/test/resources/expected-pom.xml
@@ -46,6 +46,12 @@
       <artifactId>geode-junit</artifactId>
       <version>1.8.0-SNAPSHOT</version>
       <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>geode-core</artifactId>
+          <groupId>*</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.geode</groupId>
diff --git a/geode-experimental-driver/build.gradle b/geode-experimental-driver/build.gradle
index c1b81288faa7..15f22c19997d 100644
--- a/geode-experimental-driver/build.gradle
+++ b/geode-experimental-driver/build.gradle
@@ -19,10 +19,14 @@ dependencies {
   compile(project(':geode-common'))
   compile(project(':geode-protobuf-messages'))
   testCompile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile(project(':geode-protobuf'))
   integrationTestCompile(project(':geode-core'))
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':geode-protobuf'))
 
   compile('com.google.protobuf:protobuf-java:' + project.'protobuf-java.version')
diff --git a/geode-lucene/build.gradle b/geode-lucene/build.gradle
index 10f9923f8fcf..ab53eeb4dbc8 100644
--- a/geode-lucene/build.gradle
+++ b/geode-lucene/build.gradle
@@ -25,13 +25,17 @@ dependencies {
 
   runtimeOnly('org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version')
 
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile(project(':geode-lucene:geode-lucene-test'))
   testCompile('org.apache.lucene:lucene-test-framework:' + project.'lucene.version')
   testCompile('com.pholser:junit-quickcheck-generators:' + project.'junit-quickcheck.version')
 
 
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':geode-lucene:geode-lucene-test'))
   integrationTestCompile('org.apache.lucene:lucene-analyzers-phonetic:' + project.'lucene.version')
   integrationTestCompile('pl.pragmatists:JUnitParams:' + project.'JUnitParams.version')
@@ -46,7 +50,9 @@ dependencies {
   }
 
 
-  performanceTestCompile(project(':geode-junit'))
+  performanceTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   performanceTestCompile(project(':geode-lucene:geode-lucene-test'))
 }
 
diff --git a/geode-protobuf/build.gradle b/geode-protobuf/build.gradle
index 9de7905e45f1..a88de534c835 100644
--- a/geode-protobuf/build.gradle
+++ b/geode-protobuf/build.gradle
@@ -19,9 +19,13 @@ dependencies {
   compile(project(':geode-protobuf-messages'))
   compileOnly(project(':geode-core'))
   testCompile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile(project(':geode-protobuf:geode-protobuf-test'))
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':geode-protobuf:geode-protobuf-test'))
   distributedTestCompile(project(':geode-protobuf:geode-protobuf-test'))
 
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 9378880b0c9d..094afa62a4f2 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -66,18 +66,24 @@ dependencies {
   compileOnly('org.mortbay.jetty:servlet-api:' + project.'mortbay-jetty-servlet-api.version')
 
 
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile(project(':geode-core'))
   testCompile('org.springframework:spring-test:' + project.'springframework.version')
 
 
-  integrationTestCompile(project(':geode-junit'))
+  integrationTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   integrationTestCompile(project(':geode-core'))
   integrationTestCompile(project(':geode-pulse:geode-pulse-test'))
   integrationTestCompile('org.springframework:spring-test:' + project.'springframework.version')
 
 
-  uiTestCompile(project(':geode-junit'))
+  uiTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   uiTestCompile(project(':geode-json'))
   uiTestCompile(project(':geode-pulse:geode-pulse-test'))
   uiTestCompile('org.seleniumhq.selenium:selenium-remote-driver:' + project.'selenium.version')
diff --git a/geode-pulse/geode-pulse-test/build.gradle b/geode-pulse/geode-pulse-test/build.gradle
index 176302f280c9..389f9b6994cd 100755
--- a/geode-pulse/geode-pulse-test/build.gradle
+++ b/geode-pulse/geode-pulse-test/build.gradle
@@ -18,7 +18,9 @@
 
 dependencies {
   compileOnly(project(':geode-core'))
-  compileOnly(project(':geode-junit'))
+  compileOnly(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   compileOnly(project(':geode-pulse'))
 
   compile('org.seleniumhq.selenium:selenium-api:' + project.'selenium.version')
diff --git a/geode-rebalancer/build.gradle b/geode-rebalancer/build.gradle
index 67f3df2ddea8..67f59c21d90a 100644
--- a/geode-rebalancer/build.gradle
+++ b/geode-rebalancer/build.gradle
@@ -27,5 +27,9 @@ dependencies {
 
   testCompile(project(':geode-core'))
 
-  integrationTestCompile(project(':geode-junit'))
+  integrationTestCompile('org.awaitility:awaitility:' + project.'awaitility.version')
+  // Only needed for category Flaky by Gradle
+  integrationTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
 }
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 841643c4b815..60195e653c59 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -18,8 +18,12 @@
 dependencies {
   compileOnly(project(':geode-core'))
   testCompile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
-  integrationTestCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
+  integrationTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   upgradeTestCompile(project(':geode-dunit')) {
     exclude module: 'geode-core'
   }
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 0369e530e743..f24bb533ce11 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -61,15 +61,21 @@ dependencies {
   }
 
 
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile(project(':geode-core'))
   testCompile('javax.servlet:javax.servlet-api:' + project.'javax.servlet-api.version')
 
   integrationTestCompile('org.springframework:spring-test:' + project.'springframework.version')
   integrationTestCompile('org.springframework.security:spring-security-test:' + project.'spring-security.version')
 
-  integrationTestCompile(project(':geode-junit'))
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
 }
 
 sourceSets {
diff --git a/geode-web/build.gradle b/geode-web/build.gradle
index 05c8026b48a2..e091231dccb1 100755
--- a/geode-web/build.gradle
+++ b/geode-web/build.gradle
@@ -41,10 +41,14 @@ dependencies {
   }
   
   testCompile(project(':geode-core'))
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   // have to use output since we exclude the dependent classes from jar :(
   testCompile(project(path: ':geode-core', configuration: 'classesOutput'))
-  testCompile(project(':geode-junit'))
+  testCompile(project(':geode-junit')) {
+    exclude module: 'geode-core'
+  }
   testCompile('org.springframework:spring-test:' + project.'springframework.version')
   testCompile('org.springframework:spring-webmvc:' + project.'springframework.version') {
     exclude module: 'aopalliance'
@@ -52,7 +56,9 @@ dependencies {
   }
 
 
-  integrationTestCompile(project(':geode-dunit'))
+  integrationTestCompile(project(':geode-dunit')) {
+    exclude module: 'geode-core'
+  }
 
   integrationTestRuntime(files(war.destinationDir))
   integrationTestRuntime('org.springframework:spring-webmvc:' + project.'springframework.version') {