diff --git a/core/build.gradle b/core/build.gradle
index 0a191e70ca..4445fc058e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -57,6 +57,9 @@ dependencies {
     // AssertJ: for fluent assertions for testing
     testCompile "org.assertj:assertj-core:${assertj_version}"
 
+    // TODO: Upgrade to junit-quickcheck 0.8, once it is released,
+    //       because it depends on org.javassist:javassist instead
+    //       of javassist:javassist.
     compile "com.pholser:junit-quickcheck-core:$quickcheck_version"
     compile "com.pholser:junit-quickcheck-generators:$quickcheck_version"
 
diff --git a/node/build.gradle b/node/build.gradle
index e96f8f8fd2..a8c99a4461 100644
--- a/node/build.gradle
+++ b/node/build.gradle
@@ -52,8 +52,16 @@ sourceSets {
 
 dependencies {
 
-    compile project(':finance')
-    compile project(':node-schemas')
+    // Excluding javassist:javassist (which is a transitive dependency of core)
+    // because it clashes with Hibernate's transitive org.javassist:javassist
+    // dependency.
+    // TODO: Remove both of these exclusions once junit-quickcheck 0.8 is released.
+    compile (project(':finance')) {
+        exclude group: 'javassist', module: 'javassist'
+    }
+    compile (project(':node-schemas')) {
+        exclude group: 'javassist', module: 'javassist'
+    }
 
     compile "com.google.code.findbugs:jsr305:3.0.1"