diff --git a/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java b/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
index 168a2122c..bf88ea9b7 100644
--- a/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
+++ b/e2e-test/java/org/alfresco/rest/search/sql/SearchSQLWithQuotedIdentifiers.java
@@ -70,7 +70,6 @@ public class SearchSQLWithQuotedIdentifiers extends AbstractSearchTest
         file = FileModel.getRandomFileModel(FileType.TEXT_PLAIN, "Some text content.");
 
         final CustomObjectTypeProperties attributes = new CustomObjectTypeProperties();
-//        attributes.addProperty(PropertyIds.NAME, file.getName());
         attributes.addProperty("1:name", songName);
         attributes.addProperty("1:genre", genre);
 
diff --git a/e2e-test/resources/models/SEARCH-1063.xml b/e2e-test/resources/models/SEARCH-1063.xml
index 3ba275d19..97c4f0882 100755
--- a/e2e-test/resources/models/SEARCH-1063.xml
+++ b/e2e-test/resources/models/SEARCH-1063.xml
@@ -20,7 +20,8 @@
                     <type>d:text</type>
                     <mandatory>false</mandatory>
                     <index enabled="true">
-                        <tokenised>TRUE</tokenised>
+                        <stored>true</stored>
+                        <tokenised>BOTH</tokenised>
                         <facetable>false</facetable>
                     </index>
                 </property>
@@ -29,7 +30,8 @@
                     <type>d:text</type>
                     <mandatory>false</mandatory>
                     <index enabled="true">
-                        <tokenised>TRUE</tokenised>
+                        <stored>true</stored>
+                        <tokenised>BOTH</tokenised>
                         <facetable>false</facetable>
                     </index>
                 </property>