diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java
index 74a515d..0a96776 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexAccountHandlerTest.java
@@ -55,7 +55,7 @@
   @Test
   public void deleteIsNotSupported() throws Exception {
     exception.expect(UnsupportedOperationException.class);
-    exception.expectMessage("Delete from index not supported");
+    exception.expectMessage("Delete from account index not supported");
     handler.index(id, Operation.DELETE);
   }
 
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java
index b963a5b..d2387d9 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/forwarder/ForwardedIndexGroupHandlerTest.java
@@ -55,7 +55,7 @@
   @Test
   public void deleteIsNotSupported() throws Exception {
     exception.expect(UnsupportedOperationException.class);
-    exception.expectMessage("Delete from index not supported");
+    exception.expectMessage("Delete from group index not supported");
     handler.index(uuid, Operation.DELETE);
   }