diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index e89e3fe397..9829c987d7 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -118,9 +118,13 @@ public abstract class AbstractQueryChangesTest {
 
   @After
   public void tearDownInjector() {
-    lifecycle.stop();
+    if (lifecycle != null) {
+      lifecycle.stop();
+    }
     requestContext.setContext(null);
-    db.close();
+    if (db != null) {
+      db.close();
+    }
     InMemoryDatabase.drop(schemaFactory);
   }