diff --git a/e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts b/e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts
index 0bfbb6501..97170ff88 100644
--- a/e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts
+++ b/e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts
@@ -24,9 +24,6 @@ describe("modal-shared:", async function () {
                 await screen[root]();
             });
 
-            beforeEach(async function () {
-            });
-
             afterEach(async function () {
                 if (this.currentTest.state === "failed") {
                     await driver.logTestArtifacts(this.currentTest.title);
diff --git a/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts b/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts
index d40cc07dd..60d74c835 100644
--- a/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts
+++ b/e2e/nested-router-tab-view/e2e/tab-view.e2e-spec.ts
@@ -11,13 +11,13 @@ describe("tab-view:", async function () {
     let driver: AppiumDriver;
     let screen: Screen;
 
-    before(async () => {
+    before(async function () {
         nsCapabilities.testReporter.context = this;
         driver = await createDriver();
         screen = new Screen(driver);
     });
 
-    after(async () => {
+    after(async function () {
         await driver.quit();
         console.log("Quit driver!");
     });
@@ -28,14 +28,14 @@ describe("tab-view:", async function () {
         }
     });
 
-    it("loaded home component and lists", async () => {
+    it("loaded home component and lists", async function () {
         await screen.navigateToHomePage();
         await screen.loadedHome();
         await screen.loadedPlayersList();
         await screen.loadedTeamList();
     });
 
-    it("loaded tabs component, Players List and Teams List pages", async () => {
+    it("loaded tabs component, Players List and Teams List pages", async function () {
         await screen.navigateToTabsPage();
         await screen.loadedTabs();
         await screen.loadedPlayersList();
@@ -45,7 +45,7 @@ describe("tab-view:", async function () {
         await screen.loadedPlayersList();
     });
 
-    it("should navigate Player One/Team One then back separately", async () => {
+    it("should navigate Player One/Team One then back separately", async function () {
         await testPlayerNavigated(screen, screen.playerOne);
         await gotoTeamsTab(driver);
         await testTeamNavigated(screen, screen.teamOne);
@@ -56,7 +56,7 @@ describe("tab-view:", async function () {
         await screen.loadedPlayersList();
     });
 
-    it("should navigate Player One/Team One then next Player/Team then back", async () => {
+    it("should navigate Player One/Team One then next Player/Team then back", async function () {
         await testPlayerNavigated(screen, screen.playerOne);
         await testPlayerNextNavigated(screen, screen.playerTwo);
         await gotoTeamsTab(driver);
diff --git a/e2e/renderer/e2e/action-bar.e2e-spec.ts b/e2e/renderer/e2e/action-bar.e2e-spec.ts
index 7b62008ff..b03dad5da 100644
--- a/e2e/renderer/e2e/action-bar.e2e-spec.ts
+++ b/e2e/renderer/e2e/action-bar.e2e-spec.ts
@@ -18,7 +18,7 @@ describe("Action Bar scenario", async function () {
         let toggleFirstButton: UIElement;
         let toggleSecondButton: UIElement;
 
-        before(async () => {
+        before(async function () {
             nsCapabilities.testReporter.context = this;
             driver = await createDriver();
             await driver.driver.resetApp();
@@ -52,7 +52,7 @@ describe("Action Bar scenario", async function () {
         });
 
         it("should detach first element when its condition is false", done => {
-            (async () => {
+            (async function () {
                 await toggleFirst();
 
                 try {
@@ -69,7 +69,7 @@ describe("Action Bar scenario", async function () {
         });
 
         it("should detach second element when its condition is false", done => {
-            (async () => {
+            (async function () {
                 await toggleSecond();
 
                 try {
@@ -95,15 +95,15 @@ describe("Action Bar scenario", async function () {
             await checkOrderIsCorrect();
         });
 
-        const checkOrderIsCorrect = async () => {
+        const checkOrderIsCorrect = async function () {
             await isOnTheLeft(firstActionItem, secondActionItem);
         };
 
-        const toggleFirst = async () => {
+        const toggleFirst = async function () {
             await toggleFirstButton.click();
         };
 
-        const toggleSecond = async () => {
+        const toggleSecond = async function () {
             await toggleSecondButton.click();
         };
 
@@ -113,7 +113,7 @@ describe("Action Bar scenario", async function () {
         let toggleButton: UIElement;
         let conditional: UIElement;
 
-        before(async () => {
+        before(async function () {
             nsCapabilities.testReporter.context = this;
             driver = await createDriver();
             await driver.driver.resetApp();
@@ -147,11 +147,11 @@ describe("Action Bar scenario", async function () {
             await checkOrderIsCorrect();
         });
 
-        const checkOrderIsCorrect = async () => {
+        const checkOrderIsCorrect = async function () {
             await isOnTheLeft(toggleButton, conditional);
         };
 
-        const toggle = async () => {
+        const toggle = async function () {
             await toggleButton.click();
         };
     });
diff --git a/e2e/renderer/e2e/ngfor.e2e-spec.ts b/e2e/renderer/e2e/ngfor.e2e-spec.ts
index cca35b8c1..1b9fb1331 100644
--- a/e2e/renderer/e2e/ngfor.e2e-spec.ts
+++ b/e2e/renderer/e2e/ngfor.e2e-spec.ts
@@ -15,7 +15,7 @@ describe("ngFor scenario", async function () {
     let elements: UIElement[] = [];
     let lastAddedElementId = 0;
 
-    before(async () => {
+    before(async function () {
         nsCapabilities.testReporter.context = this;
         driver = await createDriver();
         await driver.driver.resetApp();
@@ -79,7 +79,7 @@ describe("ngFor scenario", async function () {
         await checkCorrectOrderAll();
     });
 
-    const addElement = async () => {
+    const addElement = async function () {
         await addButton.click();
 
         lastAddedElementId += 1;
@@ -103,7 +103,7 @@ describe("ngFor scenario", async function () {
         lastAddedElementId -= 1;
     };
 
-    const checkAppendedCorrectly = async () => {
+    const checkAppendedCorrectly = async function () {
         const lastAdded = await driver.findElementByAutomationText(
             lastAddedElementId.toString());
 
@@ -112,7 +112,7 @@ describe("ngFor scenario", async function () {
         await isAbove(addButton, removeButton);
     };
 
-    const checkCorrectOrderAll = async () => {
+    const checkCorrectOrderAll = async function () {
         for (let i = 0; i < elements.length - 1; i += 1) {
             await isAbove(elements[i], elements[i + 1]);
         }
diff --git a/e2e/renderer/e2e/ngforof.e2e-spec.ts b/e2e/renderer/e2e/ngforof.e2e-spec.ts
index e14e079f4..5b272ff9d 100644
--- a/e2e/renderer/e2e/ngforof.e2e-spec.ts
+++ b/e2e/renderer/e2e/ngforof.e2e-spec.ts
@@ -21,7 +21,7 @@ describe("ngForOf scenario", function () {
     let elements: ElementTuple[] = [];
     let lastAddedElementId = 0;
 
-    before(async () => {
+    before(async function () {
         nsCapabilities.testReporter.context = this;
         driver = await createDriver();
         await driver.driver.resetApp();
@@ -88,7 +88,7 @@ describe("ngForOf scenario", function () {
     });
 
 
-    const addElement = async () => {
+    const addElement = async function () {
         await addButton.click();
 
         lastAddedElementId += 1;
@@ -114,7 +114,7 @@ describe("ngForOf scenario", function () {
         lastAddedElementId -= 1;
     };
 
-    const checkAppendedCorrectly = async () => {
+    const checkAppendedCorrectly = async function () {
         const lastAdded = await getElement(lastAddedElementId);
 
         await elementIsAbove(elements.slice(-2)[0], lastAdded);
@@ -122,7 +122,7 @@ describe("ngForOf scenario", function () {
         await isAbove(addButton, removeButton);
     };
 
-    const checkCorrectOrderAll = async () => {
+    const checkCorrectOrderAll = async function () {
         for (let i = 0; i < elements.length - 1; i += 1) {
             await elementIsAbove(elements[i], elements[i + 1]);
         }
diff --git a/e2e/renderer/e2e/ngif.e2e-spec.ts b/e2e/renderer/e2e/ngif.e2e-spec.ts
index c81c37a26..128dc2b74 100644
--- a/e2e/renderer/e2e/ngif.e2e-spec.ts
+++ b/e2e/renderer/e2e/ngif.e2e-spec.ts
@@ -10,7 +10,7 @@ import { isAbove } from "./helpers/location";
 
 import { assert } from "chai";
 
-describe("ngIf scenario", () => {
+describe("ngIf scenario", async function () {
     let driver: AppiumDriver;
     let toggleButton: UIElement;
 
@@ -376,7 +376,7 @@ describe("ngIf scenario", () => {
 
                 driver.findElementByAutomationText("first", 500)
                     .then(_ => { throw new Error("first label found!"); })
-                    .catch(() => {
+                    .catch(async function () {
                         driver.findElementByAutomationText("second", 500)
                             .then(_ => { throw new Error("second label found!"); })
                             .catch(() => done());
@@ -402,7 +402,7 @@ describe("ngIf scenario", () => {
 
                 driver.findElementByAutomationText("first", 500)
                     .then(_ => { throw new Error("first label found!"); })
-                    .catch(() => {
+                    .catch(async function () {
                         driver.findElementByAutomationText("second", 500)
                             .then(_ => { throw new Error("second label found!"); })
                             .catch(() => done());