diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index 7beeb1b85a..e719f8377f 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -11,13 +11,9 @@ DEPLOY_ENV = [
     "//java/com/google/gerrit/exceptions",
     "//java/com/google/gerrit/gpg",
     "//java/com/google/gerrit/git",
-    "//java/com/google/gerrit/httpd/auth/openid",
     "//java/com/google/gerrit/index:query_exception",
     "//java/com/google/gerrit/launcher",
     "//java/com/google/gerrit/lifecycle",
-    "//java/com/google/gerrit/pgm",
-    "//java/com/google/gerrit/pgm/http/jetty",
-    "//java/com/google/gerrit/pgm/util",
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/entities",
@@ -51,7 +47,6 @@ DEPLOY_ENV = [
     "//lib/guice",
     "//lib/guice:guice-assistedinject",
     "//lib/guice:guice-servlet",
-    "//lib/jetty:servlet",
     "//lib/mail",
     "//lib/mina:sshd",
     "//lib/log:impl-log4j",
@@ -63,6 +58,10 @@ DEPLOY_ENV = [
 ]
 
 TEST_DEPS = [
+    "//java/com/google/gerrit/httpd/auth/openid",
+    "//java/com/google/gerrit/pgm",
+    "//java/com/google/gerrit/pgm/http/jetty",
+    "//java/com/google/gerrit/pgm/util",
     "//java/com/google/gerrit/truth",
     "//java/com/google/gerrit/acceptance/testsuite/project",
     "//java/com/google/gerrit/server/group/testing",
@@ -74,6 +73,13 @@ TEST_DEPS = [
     "//java/com/google/gerrit/git/testing",
 ]
 
+PGM_DEPLOY_ENV = [
+    "//lib:caffeine",
+    "//lib:caffeine-guava",
+    "//lib/jackson:jackson-core",
+    "//lib/prolog:cafeteria",
+]
+
 java_library(
     name = "lib",
     testonly = True,
@@ -98,7 +104,7 @@ java_binary(
     name = "framework-deploy-env",
     testonly = True,
     main_class = "Dummy",
-    runtime_deps = DEPLOY_ENV,
+    runtime_deps = DEPLOY_ENV + PGM_DEPLOY_ENV,
 )
 
 java_library2(
diff --git a/lib/BUILD b/lib/BUILD
index 39c622abfe..2e5668e224 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -114,6 +114,7 @@ java_library(
     name = "caffeine",
     data = ["//lib:LICENSE-Apache2.0"],
     visibility = [
+        "//java/com/google/gerrit/acceptance:__pkg__",
         "//java/com/google/gerrit/server/cache/mem:__pkg__",
     ],
     exports = ["@caffeine//jar"],
@@ -128,6 +129,7 @@ java_library(
     name = "caffeine-guava",
     data = ["//lib:LICENSE-Apache2.0"],
     visibility = [
+        "//java/com/google/gerrit/acceptance:__pkg__",
         "//java/com/google/gerrit/server/cache/mem:__pkg__",
     ],
     exports = [":caffeine-guava-renamed"],
diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 3eed77ad6e..d5253a0eb6 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -4,6 +4,7 @@ java_library(
     name = "jackson-core",
     data = ["//lib:LICENSE-Apache2.0"],
     visibility = [
+        "//java/com/google/gerrit/acceptance:__pkg__",
         "//java/com/google/gerrit/elasticsearch:__pkg__",
         "//plugins:__pkg__",
     ],