diff --git a/community/community-it/index-it/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java b/community/community-it/index-it/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java
index 8cc23f2bfc414..5b1f439773bdd 100644
--- a/community/community-it/index-it/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java
+++ b/community/community-it/index-it/src/test/java/org/neo4j/index/lucene/ConstraintIndexFailureIT.java
@@ -42,7 +42,7 @@
 import static org.junit.Assert.fail;
 import static org.neo4j.graphdb.Label.label;
 import static org.neo4j.kernel.impl.index.schema.FailingGenericNativeIndexProviderFactory.FailureType.INITIAL_STATE;
-import static org.neo4j.kernel.impl.index.schema.FailingGenericNativeIndexProviderFactory.POPULATION_FAILURE_OVERRIDE;
+import static org.neo4j.kernel.impl.index.schema.FailingGenericNativeIndexProviderFactory.INITIAL_STATE_FAILURE_MESSAGE;
 import static org.neo4j.test.TestGraphDatabaseFactory.INDEX_PROVIDERS_FILTER;
 
 public class ConstraintIndexFailureIT
@@ -87,7 +87,7 @@ public void shouldFailToValidateConstraintsIfUnderlyingIndexIsFailed() throws Ex
             assertThat( e.getCause(), instanceOf( UnableToValidateConstraintException.class ) );
             assertThat( e.getCause().getCause().getMessage(), allOf(
                     containsString( "The index is in a failed state:" ),
-                    containsString( POPULATION_FAILURE_OVERRIDE ) ) );
+                    containsString( INITIAL_STATE_FAILURE_MESSAGE ) ) );
         }
         finally
         {
diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FailingGenericNativeIndexProviderFactory.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FailingGenericNativeIndexProviderFactory.java
index 0bec318edc61f..c4f104a1858d6 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FailingGenericNativeIndexProviderFactory.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/index/schema/FailingGenericNativeIndexProviderFactory.java
@@ -62,12 +62,13 @@
  */
 public class FailingGenericNativeIndexProviderFactory extends KernelExtensionFactory<GenericNativeIndexProviderFactory.Dependencies>
 {
-    public static final String POPULATION_FAILURE_OVERRIDE = "Was told to fail";
+    public static final String INITIAL_STATE_FAILURE_MESSAGE = "Override initial state as failed";
+    private static final String POPULATION_FAILURE_MESSAGE = "Fail on update during population";
 
     public enum FailureType
     {
         POPULATION,
-        INITIAL_STATE;
+        INITIAL_STATE
     }
 
     private final GenericNativeIndexProviderFactory actual;
@@ -79,7 +80,7 @@ public FailingGenericNativeIndexProviderFactory( FailureType... failureTypes )
         this( new GenericNativeIndexProviderFactory(), 10_000, failureTypes );
     }
 
-    public FailingGenericNativeIndexProviderFactory( GenericNativeIndexProviderFactory actual, int priority, FailureType... failureTypes )
+    private FailingGenericNativeIndexProviderFactory( GenericNativeIndexProviderFactory actual, int priority, FailureType... failureTypes )
     {
         super( ExtensionType.DATABASE, actual.getKeys().iterator().next() );
         if ( failureTypes.length == 0 )
@@ -118,9 +119,9 @@ public void drop()
                         }
 
                         @Override
-                        public void add( Collection<? extends IndexEntryUpdate<?>> updates ) throws IndexEntryConflictException
+                        public void add( Collection<? extends IndexEntryUpdate<?>> updates )
                         {
-                            throw new RuntimeException( "Failing index population on purpose" );
+                            throw new RuntimeException( POPULATION_FAILURE_MESSAGE );
                         }
 
                         @Override
@@ -172,7 +173,7 @@ public IndexAccessor getOnlineAccessor( StoreIndexDescriptor descriptor, IndexSa
             @Override
             public String getPopulationFailure( StoreIndexDescriptor descriptor ) throws IllegalStateException
             {
-                return failureTypes.contains( FailureType.INITIAL_STATE ) ? POPULATION_FAILURE_OVERRIDE : actualProvider.getPopulationFailure( descriptor );
+                return failureTypes.contains( FailureType.INITIAL_STATE ) ? INITIAL_STATE_FAILURE_MESSAGE : actualProvider.getPopulationFailure( descriptor );
             }
 
             @Override