diff --git a/WORKSPACE b/WORKSPACE
index 0a799f0..127ca3b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -751,13 +751,6 @@
     sha1 = "b8ba1c1eb8b2e45cfd465d01218c6060e887572e",
 )
 
-# Keep this version of Soy synchronized with the version used in Gitiles.
-maven_jar(
-    name = "soy",
-    artifact = "com.google.template:soy:2020-08-24",
-    sha1 = "e774bf5cc95923d2685292883fe219e231346e50",
-)
-
 maven_jar(
     name = "html-types",
     artifact = "com.google.common.html.types:types:1.0.8",
diff --git a/java/com/google/gerrit/server/restapi/project/ListProjects.java b/java/com/google/gerrit/server/restapi/project/ListProjects.java
index 8a2ab0c..04e573c 100644
--- a/java/com/google/gerrit/server/restapi/project/ListProjects.java
+++ b/java/com/google/gerrit/server/restapi/project/ListProjects.java
@@ -93,7 +93,7 @@
 /**
  * List projects visible to the calling user.
  *
- * <p>This is like {@link QueryProjects} but with a slightly different calling convention.
+ * <p>Implement {@code GET /projects/}, without a {@code query=} parameter.
  */
 public class ListProjects implements RestReadView<TopLevelResource> {
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
diff --git a/lib/nongoogle_test.sh b/lib/nongoogle_test.sh
index d33062f..bf53eb6 100755
--- a/lib/nongoogle_test.sh
+++ b/lib/nongoogle_test.sh
@@ -38,6 +38,7 @@
 nekohtml
 objenesis
 openid-consumer
+soy
 sshd-mina
 sshd-osgi
 testcontainers
diff --git a/tools/coverage.sh b/tools/coverage.sh
index 3582d22..e03ac7f 100755
--- a/tools/coverage.sh
+++ b/tools/coverage.sh
@@ -7,6 +7,9 @@
 # COVERAGE_CPUS defaults to 2, and the default destination is a temp
 # dir.
 
+shopt -s expand_aliases
+source ~/.bash_profile
+
 genhtml=$(which genhtml)
 if [[ -z "${genhtml}" ]]; then
     echo "Install 'genhtml' (contained in the 'lcov' package)"
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 5a2397d..52c9ca0 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -177,8 +177,14 @@
         sha1 = "8d6e7e35eac4fb5e7df19c55b3bc23fa51b10a11",
     )
 
-    # Test-only dependencies below.
+    # Keep this version of Soy synchronized with the version used in Gitiles.
+    maven_jar(
+        name = "soy",
+        artifact = "com.google.template:soy:2020-08-24",
+        sha1 = "e774bf5cc95923d2685292883fe219e231346e50",
+    )
 
+    # Test-only dependencies below.
     maven_jar(
         name = "cglib-3_2",
         artifact = "cglib:cglib-nodep:3.2.6",