diff --git a/build.gradle b/build.gradle
index 3a76228a71..56a3cf35cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -281,8 +281,7 @@ allprojects {
                     force "org.ow2.asm:asm:${asmVersion}"
                     // force junit and hamcrest versions to be consistent with what comes from labkey-client-api.
                     // The hamcrest dependencies come through transitively from jackson, junit, jmock
-                    force "org.hamcrest:hamcrest-core:${hamcrestVersion}"
-                    force "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+                    force "org.hamcrest:hamcrest:${hamcrestVersion}"
                     force "junit:junit:${junitVersion}"
                     // force consistency in nlp and saml that bring these in transitively
                     force "org.codehaus.woodstox:stax2-api:${stax2ApiVersion}"
@@ -350,6 +349,9 @@ allprojects {
                         substitute module('eigenbase:eigenbase-properties') using module("net.hydromatic:eigenbase-properties:${eigenbasePropertiesVersion}")
                         substitute module('eigenbase:eigenbase-resgen') using module("net.hydromatic:eigenbase-resgen:${eigenbaseResgenVersion}")
                         substitute module('eigenbase:eigenbase-xom') using module("net.hydromatic:eigenbase-xom:${eigenbaseXomVersion}")
+
+                        substitute module('org.hamcrest:hamcrest-core') using module("org.hamcrest:hamcrest:${hamcrestVersion}")
+                        substitute module('org.hamcrest:hamcrest-library') using module("org.hamcrest:hamcrest:${hamcrestVersion}")
                     }
                 }
             }
diff --git a/gradle.properties b/gradle.properties
index 5066dc3102..1f76a9b0dc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -180,7 +180,7 @@ gwtServletVersion=2.10.0
 # For dev builds, the targeted, single permutation browser. Can be either gwt-user-firefox, gwt-user-chrome, or gwt-user-ie
 gwtBrowser=gwt-user-chrome
 
-hamcrestVersion=1.3
+hamcrestVersion=2.2
 
 # Note: if changing this, we might need to match with the picard version in the SequenceAnalysis module build.gradle
 htsjdkVersion=4.0.0