diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java
index bc9627870..f8a4c37a1 100755
--- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java
+++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/demoapps/SpreadsheetDemoUI.java
@@ -256,6 +256,7 @@ public InputStream getStream() {
         localeSelect = new NativeSelect<>();
         localeSelect.setWidth("200px");
         localeSelect.setId("localeSelect");
+        localeSelect.getDataCommunicator().setMaximumAllowedRows(1000);
 
         final List<Locale> locales = Arrays
                 .asList(Locale.getAvailableLocales());
diff --git a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/pageobjects/HeaderPage.java b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/pageobjects/HeaderPage.java
index df7ab5fab..1abc74197 100644
--- a/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/pageobjects/HeaderPage.java
+++ b/vaadin-spreadsheet/src/test/java/com/vaadin/addon/spreadsheet/test/pageobjects/HeaderPage.java
@@ -2,7 +2,9 @@
 
 import static org.junit.Assert.assertEquals;
 
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 
 import com.vaadin.addon.spreadsheet.test.fixtures.TestFixtures;
 import com.vaadin.testbench.TestBenchTestCase;
@@ -24,7 +26,10 @@ public SpreadsheetPage createNewSpreadsheet() {
 
     public SpreadsheetPage loadFile(String testSheetFilename,
             TestBenchTestCase tbtc) {
-        ComboBoxElement testSheetSelect = $(ComboBoxElement.class).id("testSheetSelect");
+        waitUntil(ExpectedConditions
+                .presenceOfElementLocated(By.id("testSheetSelect")));
+        ComboBoxElement testSheetSelect = $(ComboBoxElement.class)
+                .id("testSheetSelect");
         testSheetSelect.selectByText(testSheetFilename);
         testSheetSelect.waitForVaadin();
         $(ButtonElement.class).id("update").click();