diff --git a/.eslintrc.js b/.eslintrc.js
index 7bd3df36..1e3602f1 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -25,6 +25,7 @@ module.exports = {
     "no-only-tests"
   ],
   "rules": {
-    "no-only-tests/no-only-tests": "error"
+    "no-only-tests/no-only-tests": "error",
+    "cypress/no-unnecessary-waiting": "warn"
   }
 }
diff --git a/README.md b/README.md
index 8ba768d5..8d4a126d 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[![wikipedia-kaios](https://img.shields.io/endpoint?url=https://dashboard.cypress.io/badge/detailed/7izdto&style=flat&logo=cypress)](https://dashboard.cypress.io/projects/7izdto/runs)
 [![CircleCI](https://circleci.com/gh/wikimedia/wikipedia-kaios/tree/master.svg?style=svg)](https://circleci.com/gh/wikimedia/wikipedia-kaios/tree/master)
 
 # Wikipedia KaiOS 
diff --git a/cypress.json b/cypress.json
index cabc1e6d..e9d8ca70 100644
--- a/cypress.json
+++ b/cypress.json
@@ -1,9 +1,8 @@
-{  
-    "viewportWidth": 240,
-    "viewportHeight": 290,
-    "videoUploadOnPasses": false,
-    "modifyObstructiveCode": false,
-    "baseUrl": "http://127.0.0.1:8080",
-    "video": false,
-    "retries": 3
+{
+  "viewportWidth": 240,
+  "viewportHeight": 290,
+  "videoUploadOnPasses": false,
+  "baseUrl": "http://127.0.0.1:8080",
+  "retries": 5,
+  "defaultCommandTimeout": 8000
 }
diff --git a/cypress/integration/search-spec.js b/cypress/integration/search-spec.js
index b4996189..61413a40 100644
--- a/cypress/integration/search-spec.js
+++ b/cypress/integration/search-spec.js
@@ -60,6 +60,7 @@ describe('Article search', () => {
     searchPage.search('cat')
     cy.getCenterSoftkeyButton().should('not.have.text')
     searchPage.results().first()
+    cy.wait(500)
     cy.downArrow()
     cy.getCenterSoftkeyButton().should('have.text', enJson['centerkey-select'])
     cy.upArrow()
diff --git a/cypress/integration/special-cases.js b/cypress/integration/special-cases.js
index 6e9596df..3e6040f8 100644
--- a/cypress/integration/special-cases.js
+++ b/cypress/integration/special-cases.js
@@ -22,6 +22,7 @@ describe('special cases tests', () => {
 
   it('gallery opens from a non-english article', () => {
     cy.navigateToPageWithoutOnboarding('article/pl/Tupolew_Tu-154/Użytkownicy[24]')
+    cy.wait(500)
     articlePage.title().should('have.text', 'Użytkownicy[24]')
     cy.rightArrow()
     cy.enter()
diff --git a/package.json b/package.json
index dbd69dbd..3b119dd6 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "cypress:fix-lint": "eslint cypress/ --fix",
     "cypress:run": "cypress run",
     "cypress:run:firefox": "cypress run --browser firefox",
-    "cypress:run:firefox:headless": "cypress run --browser firefox --headless",
+    "cypress:run:firefox:headless": "cypress run --browser firefox --headless --record --key $CYPRESS_RECORD_KEY",
     "cypress:open": "cypress open"
   },
   "repository": {