diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java
index caec5666f..69041b736 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/query/AlfrescoFTSQParserPluginTest.java
@@ -853,18 +853,8 @@ public class AlfrescoFTSQParserPluginTest extends LoadAFTSTestData implements Qu
         assertQ(areq(params("rows", "20", "qt", "/afts", "q", FIELD_INACLTXID + ":2"), null),
                 "*[count(//doc)=0]");
 
-
-
-        //TODO fix tests
-        //INVESTIGATE
-        /*
-
-        testQueryByHandler(report, core, "/native", FIELD_TXCOMMITTIME + ":*", 1, null, null, null, null,
-                null, (String) null);
-
-        testQueryByHandler(report, core, "/native", FIELD_ACLTXCOMMITTIME + ":*", 1, null, null, null,
-                null, null, (String) null);
-        */
+        assertQ(areq(params("rows", "20", "qt", "/native", "q", FIELD_TXCOMMITTIME + ":*"), null), "*[count(//doc)=1]");
+        assertQ(areq(params("rows", "20", "qt", "/native", "q", FIELD_ACLTXCOMMITTIME + ":*"), null), "*[count(//doc)=1]");
 
         assertQ(areq(params("rows", "20", "qt", "/afts", "q", FIELD_ACLID + ":1"), null),
                 "*[count(//doc)=17]");
diff --git a/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrconfig-afts.xml b/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrconfig-afts.xml
index 94efcb29f..06e4ab62f 100644
--- a/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrconfig-afts.xml
+++ b/search-services/alfresco-solr/src/test/resources/test-files/collection1/conf/solrconfig-afts.xml
@@ -268,6 +268,31 @@
         <shardHandlerFactory class="org.apache.solr.handler.component.AlfrescoHttpShardHandlerFactory" />
     </requestHandler>
 
+    <requestHandler name="/native" class="org.apache.solr.handler.component.AlfrescoSearchHandler" lazy="true" >
+        <!-- default values for query parameters can be specified, these
+             will be overridden by parameters in the request
+          -->
+        <lst name="defaults">
+            <str name="echoParams">explicit</str>
+            <int name="rows">10</int>
+            <str name="df">suggest</str>
+        </lst>
+
+
+        <arr name="components">
+            <str>setLocale</str>
+            <str>ensureModels</str>
+            <str>query</str>
+            <str>facet</str>
+            <str>mlt</str>
+            <str>highlight</str>
+            <str>stats</str>
+            <str>debug</str>
+            <str>clearLocale</str>
+        </arr>
+
+        <shardHandlerFactory class="org.apache.solr.handler.component.AlfrescoHttpShardHandlerFactory" />
+    </requestHandler>
 
     <requestHandler name="/cmis" class="org.apache.solr.handler.component.AlfrescoSearchHandler" lazy="true" >
         <lst name="defaults">