diff --git a/gerrit-acceptance-tests/BUCK b/gerrit-acceptance-tests/BUCK
index c8e2da1c5a..d93b25c889 100644
--- a/gerrit-acceptance-tests/BUCK
+++ b/gerrit-acceptance-tests/BUCK
@@ -26,6 +26,8 @@ java_library(
     '//lib:junit',
     '//lib:servlet-api-3_1',
 
+    '//lib/hamcrest:hamcrest-core',
+    '//lib/hamcrest:hamcrest-library',
     '//lib/httpcomponents:httpclient',
     '//lib/httpcomponents:httpcore',
     '//lib/log:impl_log4j',
diff --git a/lib/BUCK b/lib/BUCK
index fa7d0cf9a6..75f274926f 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -174,15 +174,7 @@ maven_jar(
   id = 'junit:junit:4.11',
   sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
   license = 'DO_NOT_DISTRIBUTE',
-  deps = [':hamcrest-core'],
-)
-
-maven_jar(
-  name = 'hamcrest-core',
-  id = 'org.hamcrest:hamcrest-core:1.3',
-  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['//lib:junit'],
+  deps = ['//lib/hamcrest:hamcrest-core'],
 )
 
 maven_jar(
diff --git a/lib/hamcrest/BUCK b/lib/hamcrest/BUCK
new file mode 100644
index 0000000000..38d7baff9d
--- /dev/null
+++ b/lib/hamcrest/BUCK
@@ -0,0 +1,25 @@
+include_defs('//lib/maven.defs')
+
+VERSION = '1.3'
+
+maven_jar(
+  name = 'hamcrest-core',
+  id = 'org.hamcrest:hamcrest-core:' + VERSION,
+  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
+  license = 'DO_NOT_DISTRIBUTE',
+  visibility = [
+    '//lib:junit',
+    '//gerrit-acceptance-tests:lib'
+  ],
+)
+
+maven_jar(
+  name = 'hamcrest-library',
+  id = 'org.hamcrest:hamcrest-library:' + VERSION,
+  sha1 = '4785a3c21320980282f9f33d0d1264a69040538f',
+  license = 'DO_NOT_DISTRIBUTE',
+  visibility = [
+    '//lib:junit',
+    '//gerrit-acceptance-tests:lib'
+  ],
+)