diff --git a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
index 60dc5d733..da27484f7 100644
--- a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
@@ -58,6 +58,7 @@ public class AbstractSearchTest extends RestTest
          *        |-- pangram.txt
          *        |-- cars.pdf
          */
+        nodesBuilder = restClient.authenticateUser(userModel).withCoreAPI().usingNode(ContentModel.my()).defineNodes();
         FolderModel folder = new FolderModel(SEARCH_DATA_SAMPLE_FOLDER);
         dataContent.usingSite(siteModel).createFolder(folder);
         //Create files
diff --git a/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java b/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java
index 6d977a35d..e0741fa00 100644
--- a/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java
@@ -35,7 +35,7 @@ public class FingerPrintTest extends AbstractSearchTest
      * The data prep should have loaded a file
      * identical to the one loaded as part of this test.
      * @throws Exception
-     */ 
+     */
     public void search() throws Exception
     {
         String uuid = file.getNodeRefWithoutVersion();
diff --git a/e2e-test/java/org/alfresco/rest/search/SearchTest.java b/e2e-test/java/org/alfresco/rest/search/SearchTest.java
index 3c785a718..72e72801a 100644
--- a/e2e-test/java/org/alfresco/rest/search/SearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/SearchTest.java
@@ -38,7 +38,8 @@ public class SearchTest extends AbstractSearchTest
         nodes.assertThat().entriesListIsNotEmpty();
         
         SearchNodeModel entity = nodes.getEntryByIndex(0);
-        Assert.assertEquals(entity.getSearch().getScore(), 1);
+        entity.assertThat().field("search").contains("score");
+        entity.getSearch().assertThat().field("score").isNotEmpty();
         entity.assertThat().field("name").contains("pangram.txt");
         
         nodes =  query("car");
@@ -46,8 +47,8 @@ public class SearchTest extends AbstractSearchTest
         entity = nodes.getEntryByIndex(0);
 
         nodes.assertThat().entriesListIsNotEmpty();
-        Assert.assertEquals(entity.getSearch().getScore(), 1);
         entity.assertThat().field("search").contains("score");
+        entity.getSearch().assertThat().field("score").isNotEmpty();
         entity.assertThat().field("name").contains("cars.txt");
     }