diff --git a/java/com/google/gerrit/pgm/init/BaseInit.java b/java/com/google/gerrit/pgm/init/BaseInit.java
index 34b2c490e9..8614347a02 100644
--- a/java/com/google/gerrit/pgm/init/BaseInit.java
+++ b/java/com/google/gerrit/pgm/init/BaseInit.java
@@ -146,7 +146,7 @@ public class BaseInit extends SiteProgram {
         } catch (OrmException e) {
           String msg = "Couldn't upgrade schema. Expected if slave and read-only database";
           System.err.println(msg);
-          logger.atWarning().withCause(e).log(msg);
+          logger.atSevere().withCause(e).log(msg);
         }
 
         init.initializer.postRun(sysInjector);
diff --git a/javatests/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java b/javatests/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java
index ed3cdbc60b..0403cab0d2 100644
--- a/javatests/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java
+++ b/javatests/com/google/gerrit/acceptance/ssh/AbstractIndexTests.java
@@ -73,7 +73,7 @@ public abstract class AbstractIndexTests extends AbstractDaemonTest {
     disableChangeIndexWrites();
     amendChange(changeId, "second test", "test2.txt", "test2");
 
-    assertChangeQuery("message:second", change.getChange(), false);
+    assertChangeQuery(change.getChange(), false);
     enableChangeIndexWrites();
 
     changeIndexedCounter.clear();
@@ -83,7 +83,7 @@ public abstract class AbstractIndexTests extends AbstractDaemonTest {
 
     changeIndexedCounter.assertReindexOf(changeInfo, 1);
 
-    assertChangeQuery("message:second", change.getChange(), true);
+    assertChangeQuery(change.getChange(), true);
   }
 
   @Test
@@ -98,7 +98,7 @@ public abstract class AbstractIndexTests extends AbstractDaemonTest {
     disableChangeIndexWrites();
     amendChange(changeId, "second test", "test2.txt", "test2");
 
-    assertChangeQuery("message:second", change.getChange(), false);
+    assertChangeQuery(change.getChange(), false);
     enableChangeIndexWrites();
 
     changeIndexedCounter.clear();
@@ -115,12 +115,11 @@ public abstract class AbstractIndexTests extends AbstractDaemonTest {
 
     changeIndexedCounter.assertReindexOf(changeInfo, 1);
 
-    assertChangeQuery("message:second", change.getChange(), true);
+    assertChangeQuery(change.getChange(), true);
   }
 
-  protected void assertChangeQuery(String q, ChangeData change, boolean assertTrue)
-      throws Exception {
-    List<Integer> ids = query(q).stream().map(c -> c._number).collect(toList());
+  private void assertChangeQuery(ChangeData change, boolean assertTrue) throws Exception {
+    List<Integer> ids = query("message:second").stream().map(c -> c._number).collect(toList());
     if (assertTrue) {
       assertThat(ids).contains(change.getId().get());
     } else {
diff --git a/tools/bzl/genrule2.bzl b/tools/bzl/genrule2.bzl
index 3113022104..d0b0969438 100644
--- a/tools/bzl/genrule2.bzl
+++ b/tools/bzl/genrule2.bzl
@@ -21,6 +21,7 @@ def genrule2(cmd, **kwargs):
         "ROOT=$$PWD",
         "TMP=$$(mktemp -d || mktemp -d -t bazel-tmp)",
         "(" + cmd + ")",
+        "rm -rf $$TMP",
     ])
     native.genrule(
         cmd = cmd,