Merge "Add test for Revert with message"
diff --git a/java/com/google/gerrit/testing/InMemoryModule.java b/java/com/google/gerrit/testing/InMemoryModule.java
index d552095..08835cc 100644
--- a/java/com/google/gerrit/testing/InMemoryModule.java
+++ b/java/com/google/gerrit/testing/InMemoryModule.java
@@ -227,11 +227,10 @@
 
     IndexType indexType = new IndexType(cfg.getString("index", null, "type"));
     // For custom index types, callers must provide their own module.
-    if (indexType.isElasticsearch()) {
-      install(elasticIndexModule());
-    } else {
-      // Also the default "custom" module for testing.
+    if (indexType.isLucene()) {
       install(luceneIndexModule());
+    } else if (indexType.isElasticsearch()) {
+      install(elasticIndexModule());
     }
     bind(ServerInformationImpl.class);
     bind(ServerInformation.class).to(ServerInformationImpl.class);