diff --git a/core/src/components/nav/test/nav-controller.spec.ts b/core/src/components/nav/test/nav-controller.spec.ts
index 8c310ce651..50af21d6bc 100644
--- a/core/src/components/nav/test/nav-controller.spec.ts
+++ b/core/src/components/nav/test/nav-controller.spec.ts
@@ -888,11 +888,15 @@ describe('NavController', () => {
       ionViewWillUnload: jest.spyOn(element, 'ionViewWillUnload'),
     };
 
-    element.addEventListener('ionViewWillEnter', element.ionViewWillEnter);
-    element.addEventListener('ionViewDidEnter', element.ionViewDidEnter);
-    element.addEventListener('ionViewWillLeave', element.ionViewWillLeave);
-    element.addEventListener('ionViewDidLeave', element.ionViewDidLeave);
-    element.addEventListener('ionViewWillUnload', element.ionViewWillUnload);
+    element.dispatchEvent = (ev: CustomEvent) => {
+      switch(ev.type) {
+        case 'ionViewWillEnter': element.ionViewWillEnter(); break;
+        case 'ionViewDidEnter': element.ionViewDidEnter(); break;
+        case 'ionViewWillLeave': element.ionViewWillLeave(); break;
+        case 'ionViewDidLeave': element.ionViewDidLeave(); break;
+        case 'ionViewWillUnload': element.ionViewWillUnload(); break;
+      }
+    };
     return instance;
   }
 
diff --git a/core/src/components/toggle/test/toggle.e2e.ts b/core/src/components/toggle/test/toggle.e2e.ts
index 66ce151b6c..a30f80e2f8 100644
--- a/core/src/components/toggle/test/toggle.e2e.ts
+++ b/core/src/components/toggle/test/toggle.e2e.ts
@@ -44,7 +44,7 @@ describe('toggle', () => {
     });
 
     // set unchecked
-    await toggle.setProperty('checked', false);
+    toggle.setProperty('checked', false);
 
     // wait for the changes to apply
     await page.waitForChanges();
@@ -97,7 +97,7 @@ describe('toggle', () => {
     expect(checkedValue).toBe(true);
 
     // set checked true again, no actual change
-    await toggle.setProperty('checked', true);
+    toggle.setProperty('checked', true);
 
     // wait for the changes to apply
     await page.waitForChanges();