diff --git a/cypress/integration/smoke-tests/load-state-file-arcgis.spec.js b/cypress/integration/smoke-tests/load-state-file-arcgis.spec.js
index d0a6ac2d9..e83a02ae3 100644
--- a/cypress/integration/smoke-tests/load-state-file-arcgis.spec.js
+++ b/cypress/integration/smoke-tests/load-state-file-arcgis.spec.js
@@ -51,7 +51,7 @@ describe('Import state file', function() {
     cy.get(os.Map.MAP_MODE_BUTTON).should('contain', '2D');
     cy.get(os.Application.PAGE).trigger('mouseenter').trigger('mousemove');
     cy.get(os.statusBar.COORDINATES_TEXT).should('contain', '+39');
-    cy.get(os.layersDialog.Tabs.Layers.Tree.LAYER_4).should('contain', 'Police Stations Features (3)');
+    cy.get(os.layersDialog.Tabs.Layers.Tree.LAYER_4).should('contain', 'Police Stations Features (3)', {timeout: 8000});
     cy.get(os.layersDialog.Tabs.Layers.Tree.LAYER_5).should('contain', 'Fire Hydrants Features (747)');
     cy.get(os.layersDialog.Tabs.Layers.Tree.Type.mapLayer.STREET_MAP_TILES)
         .find(os.layersDialog.Tabs.Layers.Tree.LAYER_TOGGLE_CHECKBOX_WILDCARD)
diff --git a/cypress/integration/smoke-tests/toolbar-right.spec.js b/cypress/integration/smoke-tests/toolbar-right.spec.js
index 4f10b6193..2d5d83a4a 100755
--- a/cypress/integration/smoke-tests/toolbar-right.spec.js
+++ b/cypress/integration/smoke-tests/toolbar-right.spec.js
@@ -104,7 +104,8 @@ describe('Toolbar right', function() {
       cy.get(os.importStateDialog.DIALOG).should('be.visible');
       cy.get(os.importStateDialog.CLEAR_CHECKBOX).check();
       cy.get(os.importStateDialog.OK_BUTTON).click();
-      cy.get(os.layersDialog.Tabs.Layers.Tree.LAYER_4).should('contain', 'Police Stations Features (3)');
+      cy.get(os.layersDialog.Tabs.Layers.Tree.LAYER_4).should('contain', 'Police Stations Features (3)',
+       {timeout: 8000});
       cy.get(os.layersDialog.Tabs.Layers.Tree.LAYER_5).should('contain', 'Fire Hydrants Features (747)');
       cy.get(os.layersDialog.Tabs.Areas.TAB).click();
       cy.get(os.layersDialog.Tabs.Areas.Tree.AREA_2).should('contain', 'Aurora Hydrant Include');
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 9256b5a82..571bd3076 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -44,7 +44,7 @@ addMatchImageSnapshotCommand({
 });
 
 Cypress.Commands.add('imageComparison', function(name) {
-  cy.wait(2500);
+  cy.wait(4000);
   cy.matchImageSnapshot(name);
 });