diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 843e21555..fa2f0d4f9 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -280,6 +280,24 @@
                             <resources>
                                 <resource>
                                     <directory>src/main/resources/solr/instance</directory>
+                                    <excludes>
+                                        <exclude>conf/shared.properties</exclude>
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-test-conf</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.testOutputDirectory}/test-files/conf</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/resources/test-files/conf</directory>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java
index ef0c13e79..815e0b796 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java
@@ -531,6 +531,8 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4
     {
         FileUtils.copyFile(new File(getTestFilesHome(), getSolrXml()), jettyHome.resolve(getSolrXml()).toFile());
 
+        //Add solr home conf folder with alfresco based configuration.
+        FileUtils.copyDirectory(new File(getTestFilesHome() + "/conf"), jettyHome.resolve("conf").toFile());
         // Add alfresco data model def
         FileUtils.copyDirectory(new File(getTestFilesHome() + "/alfrescoModels"), jettyHome.resolve("alfrescoModels").toFile());
         // Add templates
diff --git a/search-services/alfresco-search/src/test/resources/test-files/conf/shared.properties b/search-services/alfresco-search/src/test/resources/test-files/conf/shared.properties
new file mode 100644
index 000000000..9c7acf8bb
--- /dev/null
+++ b/search-services/alfresco-search/src/test/resources/test-files/conf/shared.properties
@@ -0,0 +1,36 @@
+
+# Shared Properties file
+
+#Host details an external client would use to connect to Solr
+solr.host=localhost
+#If not set then solr.port will be the jetty.port
+#solr.port=8983
+solr.baseurl=/solr
+
+# Properties treated as identifiers when indexed
+
+alfresco.identifier.property.0={http://www.alfresco.org/model/content/1.0}creator
+alfresco.identifier.property.1={http://www.alfresco.org/model/content/1.0}modifier
+alfresco.identifier.property.2={http://www.alfresco.org/model/content/1.0}userName
+alfresco.identifier.property.3={http://www.alfresco.org/model/content/1.0}authorityName
+alfresco.identifier.property.4={http://www.alfresco.org/model/content/1.0}lockOwner
+
+# Suggestable Propeties
+alfresco.suggestable.property.0={http://www.alfresco.org/model/content/1.0}name
+alfresco.suggestable.property.1={http://www.alfresco.org/model/content/1.0}title
+alfresco.suggestable.property.2={http://www.alfresco.org/model/content/1.0}description
+alfresco.suggestable.property.3={http://www.alfresco.org/model/content/1.0}content
+
+# Data types that support cross locale/word splitting/token patterns if tokenised
+alfresco.cross.locale.property.0={http://www.alfresco.org/model/content/1.0}name
+alfresco.cross.locale.property.1={http://www.alfresco.org/model/content/1.0}lockOwner
+
+# Data types that support cross locale/word splitting/token patterns if tokenised
+alfresco.cross.locale.datatype.0={http://www.alfresco.org/model/dictionary/1.0}text
+alfresco.cross.locale.datatype.1={http://www.alfresco.org/model/dictionary/1.0}content
+alfresco.cross.locale.datatype.2={http://www.alfresco.org/model/dictionary/1.0}mltext
+
+alfresco.model.tracker.cron=0/10 * * * * ? *
+
+# Whether path queries are enabled.
+alfresco.cascade.tracker.enabled=true