diff --git a/BUCK b/BUCK
index 11c5585..5f03047 100644
--- a/BUCK
+++ b/BUCK
@@ -2,10 +2,9 @@
 
 MODULE = 'com.googlesource.gerrit.plugins.importer.Importer'
 
-if STANDALONE_MODE:
-  HTTP_LIB = '//lib/http:http_lib'
-else:
-  HTTP_LIB = '//plugins/importer/lib/http:http_lib'
+PROVIDED_DEPS = [
+  '//lib:gson',
+]
 
 gerrit_plugin(
   name = 'importer',
@@ -20,13 +19,7 @@
     'Gerrit-SshModule: com.googlesource.gerrit.plugins.importer.SshModule',
     'Gerrit-HttpModule: com.googlesource.gerrit.plugins.importer.HttpModule',
   ],
-  deps = [
-    HTTP_LIB,
-  ],
-  provided_deps = [
-    '//lib:gson',
-    '//lib/log:log4j',
-  ],
+  provided_deps = PROVIDED_DEPS + GERRIT_TESTS,
 )
 
 # this is required for bucklets/tools/eclipse/project.py to work
@@ -34,4 +27,3 @@
   name = 'classpath',
   deps = [':importer__plugin'],
 )
-
diff --git a/lib/commons/BUCK b/lib/commons/BUCK
deleted file mode 100644
index ba42a1f..0000000
--- a/lib/commons/BUCK
+++ /dev/null
@@ -1,41 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-java_library(
-  name = 'commons_lib',
-  deps = [
-    ':codec',
-    ':io',
-    ':lang',
-  ],
-  visibility = ['PUBLIC'],
-)
-
-EXCLUDE = [
-  'META-INF/LICENSE.txt',
-  'META-INF/NOTICE.txt'
-]
-
-maven_jar(
-  name = 'codec',
-  id = 'commons-codec:commons-codec:1.4',
-  sha1 = '4216af16d38465bbab0f3dff8efa14204f7a399a',
-  license = 'Apache2.0',
-  exclude = EXCLUDE,
-)
-
-maven_jar(
-  name = 'io',
-  id = 'commons-io:commons-io:1.4',
-  sha1 = 'a8762d07e76cfde2395257a5da47ba7c1dbd3dce',
-  license = 'Apache2.0',
-  exclude = EXCLUDE,
-)
-
-maven_jar(
-  name = 'lang',
-  id = 'commons-lang:commons-lang:2.5',
-  sha1 = 'b0236b252e86419eef20c31a44579d2aee2f0a69',
-  license = 'Apache2.0',
-  exclude = EXCLUDE,
-)
-
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 7571746..6bcc623 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -18,3 +18,11 @@
   repository = REPO,
   license = 'Apache2.0',
 )
+
+maven_jar(
+  name = 'acceptance-framework',
+  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
+  license = 'Apache2.0',
+  attach_source = False,
+  repository = REPO,
+)
diff --git a/lib/http/BUCK b/lib/http/BUCK
deleted file mode 100644
index 4de1df9..0000000
--- a/lib/http/BUCK
+++ /dev/null
@@ -1,40 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-include_defs('//bucklets/maven_jar.bucklet')
-
-if STANDALONE_MODE:
-  COMMONS = '//lib/commons:commons_lib'
-  LOG = '//lib/log:jcl-over-slf4j'
-else:
-  COMMONS = '//plugins/importer/lib/commons:commons_lib'
-  LOG = '//plugins/importer/lib/log:jcl-over-slf4j'
-
-java_library(
-  name = 'http_lib',
-  exported_deps = [
-    ':httpclient',
-    ':httpcore',
-  ],
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'httpclient',
-  id = 'org.apache.httpcomponents:httpclient:4.3.4',
-  bin_sha1 = 'a9a1fef2faefed639ee0d0fba5b3b8e4eb2ff2d8',
-  src_sha1 = '7a14aafed8c5e2c4e360a2c1abd1602efa768b1f',
-  license = 'Apache2.0',
-  deps = [
-    COMMONS,
-    ':httpcore',
-    LOG,
-  ],
-)
-
-maven_jar(
-  name = 'httpcore',
-  id = 'org.apache.httpcomponents:httpcore:4.3.2',
-  bin_sha1 = '31fbbff1ddbf98f3aa7377c94d33b0447c646b6e',
-  src_sha1 = '4809f38359edeea9487f747e09aa58ec8d3a54c5',
-  license = 'Apache2.0',
-)
-
diff --git a/lib/log/BUCK b/lib/log/BUCK
deleted file mode 100644
index 17e606b..0000000
--- a/lib/log/BUCK
+++ /dev/null
@@ -1,16 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'jcl-over-slf4j',
-  id = 'org.slf4j:jcl-over-slf4j:1.7.7',
-  sha1 = '56003dcd0a31deea6391b9e2ef2f2dc90b205a92',
-  license = 'slf4j',
-)
-
-maven_jar(
-  name = 'log4j',
-  id = 'log4j:log4j:1.2.17',
-  sha1 = '5af35056b4d257e4b64b9e8069c0746e8b08629f',
-  license = 'Apache2.0',
-  exclude = ['META-INF/LICENSE', 'META-INF/NOTICE'],
-)