diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java
index d0ed79329..97bece5f7 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/AbstractSearchExactTermTest.java
@@ -127,9 +127,8 @@ public abstract class AbstractSearchExactTermTest extends AbstractE2EFunctionalT
                     createdFileModels.add(fileModel);
                     
                 });
-        
-        waitForContentIndexing(createdFileModels.get(createdFileModels.size() - 1).getName(), true);
-        
+
+        createdFileModels.forEach(m -> waitForContentIndexing(m.getName(), true));
     }
     
     @BeforeClass(alwaysRun = true)