diff --git a/test/e2e/commands/account.test.ts b/test/e2e/commands/account.test.ts
index 48cdb3efd..41ed974cd 100644
--- a/test/e2e/commands/account.test.ts
+++ b/test/e2e/commands/account.test.ts
@@ -57,14 +57,13 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
     const configManager = bootstrapResp.opts.configManager
     const nodeCmd = bootstrapResp.cmd.nodeCmd
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(3 * MINUTES)
 
       await getNodeLogs(k8, namespace)
       await k8.deleteNamespace(namespace)
       await accountManager.close()
       await nodeCmd.close()
-      done()
     })
 
     describe('node proxies should be UP', () => {
@@ -93,10 +92,9 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
           await accountManager.loadNodeClient(namespace)
         })
 
-        after(async function (done) {
+        after(async function () {
           this.timeout(20 * SECONDS)
           await accountManager.close()
-          done()
         })
 
         for (const [start, end] of testSystemAccounts) {
diff --git a/test/e2e/commands/cluster.test.ts b/test/e2e/commands/cluster.test.ts
index f751e7c3d..2c1357136 100644
--- a/test/e2e/commands/cluster.test.ts
+++ b/test/e2e/commands/cluster.test.ts
@@ -60,7 +60,7 @@ describe('ClusterCommand', () => {
 
   const clusterCmd = bootstrapResp.cmd.clusterCmd
 
-  after(async function (done) {
+  after(async function () {
     this.timeout(3 * MINUTES)
 
     await k8.deleteNamespace(namespace)
@@ -70,7 +70,6 @@ describe('ClusterCommand', () => {
     do {
       await sleep(5 * SECONDS)
     } while (!await chartManager.isChartInstalled(constants.SOLO_SETUP_NAMESPACE, constants.SOLO_CLUSTER_SETUP_CHART))
-    done()
   })
 
   beforeEach(() => configManager.reset())
diff --git a/test/e2e/commands/mirror_node.test.ts b/test/e2e/commands/mirror_node.test.ts
index d3027000b..7084edc27 100644
--- a/test/e2e/commands/mirror_node.test.ts
+++ b/test/e2e/commands/mirror_node.test.ts
@@ -67,7 +67,7 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
       bootstrapResp.opts.logger.showUser(`------------------------- START: ${testName} ----------------------------`)
     })
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(3 * MINUTES)
 
       await getNodeLogs(k8, namespace)
@@ -75,7 +75,6 @@ e2eTestSuite(testName, argv, undefined, undefined, undefined, undefined, undefin
       await accountManager.close()
 
       bootstrapResp.opts.logger.showUser(`------------------------- END: ${testName} ----------------------------`)
-      done()
     })
 
     // give a few ticks so that connections can close
diff --git a/test/e2e/commands/network.test.ts b/test/e2e/commands/network.test.ts
index ebac34d18..3f33185bc 100644
--- a/test/e2e/commands/network.test.ts
+++ b/test/e2e/commands/network.test.ts
@@ -62,13 +62,12 @@ describe('NetworkCommand', () => {
   const initCmd = bootstrapResp.cmd.initCmd
   const nodeCmd = bootstrapResp.cmd.nodeCmd
 
-  after(async function (done) {
+  after(async function () {
     this.timeout(3 * MINUTES)
 
     await getNodeLogs(k8, namespace)
     await k8.deleteNamespace(namespace)
     await accountManager.close()
-    done()
   })
 
   before(async () => {
diff --git a/test/e2e/commands/node_delete.test.ts b/test/e2e/commands/node_delete.test.ts
index 8a7ad72b3..616fec7d5 100644
--- a/test/e2e/commands/node_delete.test.ts
+++ b/test/e2e/commands/node_delete.test.ts
@@ -50,11 +50,10 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     const accountCmd = bootstrapResp.cmd.accountCmd
     const k8 = bootstrapResp.opts.k8
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(10 * MINUTES)
       await getNodeLogs(k8, namespace)
       await k8.deleteNamespace(namespace)
-      done()
     })
 
     it('should succeed with init command', async () => {
diff --git a/test/e2e/commands/node_update.test.ts b/test/e2e/commands/node_update.test.ts
index 416fd2ae9..69454b4a2 100644
--- a/test/e2e/commands/node_update.test.ts
+++ b/test/e2e/commands/node_update.test.ts
@@ -60,13 +60,12 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     let existingServiceMap
     let existingNodeIdsPrivateKeysHash
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(10 * MINUTES)
 
       await getNodeLogs(k8, namespace)
       await nodeCmd.stop(argv)
       await k8.deleteNamespace(namespace)
-      done()
     })
 
     it('cache current version of private keys', async () => {
diff --git a/test/e2e/commands/node_upgrade.test.ts b/test/e2e/commands/node_upgrade.test.ts
index 68cabc466..8c3546602 100644
--- a/test/e2e/commands/node_upgrade.test.ts
+++ b/test/e2e/commands/node_upgrade.test.ts
@@ -49,12 +49,11 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     const accountCmd = bootstrapResp.cmd.accountCmd
     const k8 = bootstrapResp.opts.k8
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(10 * MINUTES)
 
       await getNodeLogs(k8, namespace)
       await k8.deleteNamespace(namespace)
-      done()
     })
 
     it('should succeed with init command', async () => {
diff --git a/test/e2e/commands/separate_node_add.test.ts b/test/e2e/commands/separate_node_add.test.ts
index c0d364290..1d49eef08 100644
--- a/test/e2e/commands/separate_node_add.test.ts
+++ b/test/e2e/commands/separate_node_add.test.ts
@@ -61,7 +61,7 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     let existingServiceMap
     let existingNodeIdsPrivateKeysHash
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(10 * MINUTES)
 
       await getNodeLogs(k8, namespace)
@@ -70,7 +70,6 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
       await nodeCmd.stop(argv)
       await networkCmd.destroy(argv)
       await k8.deleteNamespace(namespace)
-      done()
     })
 
     it('cache current version of private keys', async () => {
diff --git a/test/e2e/commands/separate_node_delete.test.ts b/test/e2e/commands/separate_node_delete.test.ts
index f33edd823..ec77edd16 100644
--- a/test/e2e/commands/separate_node_delete.test.ts
+++ b/test/e2e/commands/separate_node_delete.test.ts
@@ -57,12 +57,11 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     const accountCmd = bootstrapResp.cmd.accountCmd
     const k8 = bootstrapResp.opts.k8
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(10 * MINUTES)
 
       await getNodeLogs(k8, namespace)
       await k8.deleteNamespace(namespace)
-      done()
     })
 
     it('should succeed with init command', async () => {
diff --git a/test/e2e/e2e_node_util.ts b/test/e2e/e2e_node_util.ts
index 7cae91dc4..e353a68e3 100644
--- a/test/e2e/e2e_node_util.ts
+++ b/test/e2e/e2e_node_util.ts
@@ -62,12 +62,11 @@ export function e2eNodeKeyRefreshTest (testName: string, mode: string, releaseTa
         await accountManager.close()
       })
 
-      after(async function (done) {
+      after(async function () {
         this.timeout(10 * MINUTES)
 
         await getNodeLogs(k8, namespace)
         await k8.deleteNamespace(namespace)
-        done()
       })
 
       describe(`Node should have started successfully [mode ${mode}, release ${releaseTag}]`, () => {
diff --git a/test/e2e/integration/core/account_manager.test.ts b/test/e2e/integration/core/account_manager.test.ts
index ae90a01dc..0828f2758 100644
--- a/test/e2e/integration/core/account_manager.test.ts
+++ b/test/e2e/integration/core/account_manager.test.ts
@@ -40,12 +40,11 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     const accountManager = bootstrapResp.opts.accountManager
     const configManager = bootstrapResp.opts.configManager
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(3 * MINUTES)
 
       await k8.deleteNamespace(namespace)
       await accountManager.close()
-      done()
     })
 
     it('should be able to stop port forwards', async () => {
diff --git a/test/e2e/integration/core/k8_e2e.test.ts b/test/e2e/integration/core/k8_e2e.test.ts
index 4e7c911a6..243bc8716 100644
--- a/test/e2e/integration/core/k8_e2e.test.ts
+++ b/test/e2e/integration/core/k8_e2e.test.ts
@@ -104,7 +104,7 @@ describe('K8', () => {
     }
   })
 
-  after(async function (done) {
+  after(async function () {
     this.timeout(defaultTimeout)
     try {
       await k8.kubeClient.deleteNamespacedPod(podName, testNamespace, undefined, undefined, 1)
@@ -113,8 +113,6 @@ describe('K8', () => {
     } catch (e) {
       console.log(e)
       throw e
-    } finally {
-      done()
     }
   })
 
diff --git a/test/e2e/integration/core/platform_installer_e2e.test.ts b/test/e2e/integration/core/platform_installer_e2e.test.ts
index 91273a1f5..cb70703b7 100644
--- a/test/e2e/integration/core/platform_installer_e2e.test.ts
+++ b/test/e2e/integration/core/platform_installer_e2e.test.ts
@@ -54,12 +54,11 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
     const podName = 'network-node1-0'
     const packageVersion = 'v0.42.5'
 
-    after(async function (done) {
+    after(async function () {
       this.timeout(3 * MINUTES)
 
       await k8.deleteNamespace(namespace)
       await accountManager.close()
-      done()
     })
 
     before(function () {
diff --git a/test/test_add.ts b/test/test_add.ts
index 3c636a7a9..677185a27 100644
--- a/test/test_add.ts
+++ b/test/test_add.ts
@@ -60,7 +60,7 @@ export function testNodeAdd (localBuildPath: string, testDescription: string = '
       let existingServiceMap: Map<NodeAlias, NetworkNodeServices>
       let existingNodeIdsPrivateKeysHash: Map<NodeAlias, Map<string, string>>
 
-      after(async function (done) {
+      after(async function () {
         this.timeout(10 * MINUTES)
 
         await getNodeLogs(k8, namespace)
@@ -68,7 +68,6 @@ export function testNodeAdd (localBuildPath: string, testDescription: string = '
         await nodeCmd.stop(argv)
         await networkCmd.destroy(argv)
         await k8.deleteNamespace(namespace)
-        done()
       })
 
       it('cache current version of private keys', async () => {
diff --git a/test/test_util.ts b/test/test_util.ts
index 186131a49..299939a5b 100644
--- a/test/test_util.ts
+++ b/test/test_util.ts
@@ -209,11 +209,10 @@ export function e2eTestSuite (
         bootstrapResp.opts.logger.showUser(`------------------------- START: bootstrap (${testName}) ----------------------------`)
       })
 
-      after(async function (done) {
+      after(async function () {
         this.timeout(3 * MINUTES)
         await getNodeLogs(k8, namespace)
         bootstrapResp.opts.logger.showUser(`------------------------- END: bootstrap (${testName}) ----------------------------`)
-        done()
       })
 
       it('should cleanup previous deployment', async () => {