diff --git a/src/Umbraco.Examine/IIndexCreator.cs b/src/Umbraco.Examine/IIndexCreator.cs
new file mode 100644
index 0000000000..3b8f683990
--- /dev/null
+++ b/src/Umbraco.Examine/IIndexCreator.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Examine;
+
+namespace Umbraco.Examine
+{
+    /// <summary>
+    /// Creates <see cref="IIndex"/>'s 
+    /// </summary>
+    public interface IIndexCreator
+    {
+        IEnumerable<IIndex> Create();
+    }
+}
diff --git a/src/Umbraco.Examine/IIndexDiagnostics.cs b/src/Umbraco.Examine/IIndexDiagnostics.cs
index 04ca4a6ab9..29d530c2d0 100644
--- a/src/Umbraco.Examine/IIndexDiagnostics.cs
+++ b/src/Umbraco.Examine/IIndexDiagnostics.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
-using Examine;
 using Umbraco.Core;
 
 namespace Umbraco.Examine
 {
-    
-
     /// <summary>
     /// Exposes diagnostic information about an index
     /// </summary>
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index 0aedf6e754..aa57707b2e 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -66,6 +66,7 @@
     <Compile Include="ExamineExtensions.cs" />
     <Compile Include="IContentValueSetBuilder.cs" />
     <Compile Include="IContentValueSetValidator.cs" />
+    <Compile Include="IIndexCreator.cs" />
     <Compile Include="IIndexDiagnostics.cs" />
     <Compile Include="IIndexPopulator.cs" />
     <Compile Include="IndexPopulator.cs" />
diff --git a/src/Umbraco.Web/Search/IUmbracoIndexesCreator.cs b/src/Umbraco.Web/Search/IUmbracoIndexesCreator.cs
index 58014597d2..d654e4effd 100644
--- a/src/Umbraco.Web/Search/IUmbracoIndexesCreator.cs
+++ b/src/Umbraco.Web/Search/IUmbracoIndexesCreator.cs
@@ -1,13 +1,14 @@
 using System.Collections.Generic;
 using Examine;
+using Umbraco.Examine;
 
 namespace Umbraco.Web.Search
 {
+    /// <inheritdoc />
     /// <summary>
     /// Used to create the Umbraco indexes
     /// </summary>
-    public interface IUmbracoIndexesCreator
+    public interface IUmbracoIndexesCreator : IIndexCreator
     {
-        IEnumerable<IIndex> Create();
     }
 }