diff --git a/package.json b/package.json
index 76192f86..f3359a6d 100644
--- a/package.json
+++ b/package.json
@@ -24,10 +24,10 @@
   ],
   "scripts": {
     "clean": "rimraf .tap node_modules types",
-    "test": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 60 --jobs 1 --disable-coverage",
-    "test:integration": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 60 --jobs 1 --disable-coverage test/integration/**/*.test.mjs",
-    "test:unit": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 60 --jobs 1 --disable-coverage test/*.test.mjs",
-    "test:tasks": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 60 --jobs 1 --disable-coverage test/tasks/*.test.mjs",
+    "test": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 240 --disable-coverage",
+    "test:integration": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 240 --disable-coverage test/integration/**/*.test.mjs",
+    "test:unit": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 240 --disable-coverage test/*.test.mjs",
+    "test:tasks": "cross-env HTTP_PORT=0 LOG_LEVEL=fatal tap --timeout 240 --disable-coverage test/tasks/*.test.mjs",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "format:check": "prettier -c .",
diff --git a/test/integration/alias-legacy.test.mjs b/test/integration/alias-legacy.test.mjs
index 06012d1c..bc2a70c2 100644
--- a/test/integration/alias-legacy.test.mjs
+++ b/test/integration/alias-legacy.test.mjs
@@ -75,11 +75,9 @@ beforeEach(async (t) => {
 	t.context.token = token;
 });
 
-afterEach(async (t) => {
-	await t.context.server.close();
-});
+afterEach((t) => t.context.server.close());
 
-await test("eik package-alias <name> <version> <alias>", async (t) => {
+test("eik package-alias <name> <version> <alias>", async (t) => {
 	const { address, token, folder: cwd } = t.context;
 	const eik = join(__dirname, "..", "..", "index.js");
 
@@ -121,7 +119,7 @@ await test("eik package-alias <name> <version> <alias>", async (t) => {
 	t.equal(res.ok, true);
 });
 
-await test("eik npm-alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
+test("eik npm-alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
 	const eik = join(__dirname, "..", "..", "index.js");
 	const cmd = `node ${eik} npm-alias scroll-into-view-if-needed 2.2.24 2
         --token ${t.context.token}
@@ -144,7 +142,7 @@ await test("eik npm-alias <name> <version> <alias> --token --server : no eik.jso
 	t.end();
 });
 
-await test("eik npm-alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
+test("eik npm-alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
 	const assets = {
 		name: "test-app",
 		version: "1.0.0",
@@ -177,7 +175,7 @@ await test("eik npm-alias <name> <version> <alias> : publish details provided by
 	t.end();
 });
 
-await test("eik map-alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
+test("eik map-alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
 	const eik = join(__dirname, "..", "..", "index.js");
 	const cmd = `node ${eik} map-alias test-map 1.0.0 1
         --token ${t.context.token}
@@ -198,7 +196,7 @@ await test("eik map-alias <name> <version> <alias> --token --server : no eik.jso
 	t.end();
 });
 
-await test("eik map-alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
+test("eik map-alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
 	const assets = {
 		name: "test-app",
 		version: "1.0.0",
diff --git a/test/integration/alias.test.mjs b/test/integration/alias.test.mjs
index f43385be..aeb97a90 100644
--- a/test/integration/alias.test.mjs
+++ b/test/integration/alias.test.mjs
@@ -75,11 +75,9 @@ beforeEach(async (t) => {
 	t.context.token = token;
 });
 
-afterEach(async (t) => {
-	await t.context.server.close();
-});
+afterEach((t) => t.context.server.close());
 
-await test("packages: eik alias <name> <version> <alias>", async (t) => {
+test("packages: eik alias <name> <version> <alias>", async (t) => {
 	const { address, token, folder: cwd } = t.context;
 	const eik = join(__dirname, "..", "..", "index.js");
 
@@ -118,7 +116,7 @@ await test("packages: eik alias <name> <version> <alias>", async (t) => {
 	t.match(out.stdout, "NEW");
 });
 
-await test("npm: eik alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
+test("npm: eik alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
 	const eik = join(__dirname, "..", "..", "index.js");
 	const cmd = `node ${eik} npm-alias scroll-into-view-if-needed 2.2.24 2
         --token ${t.context.token}
@@ -142,7 +140,7 @@ await test("npm: eik alias <name> <version> <alias> --token --server : no eik.js
 	t.end();
 });
 
-await test("npm: eik alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
+test("npm: eik alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
 	const assets = {
 		name: "test-app",
 		type: "npm",
@@ -176,7 +174,7 @@ await test("npm: eik alias <name> <version> <alias> : publish details provided b
 	t.end();
 });
 
-await test("map: eik alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
+test("map: eik alias <name> <version> <alias> --token --server : no eik.json or .eikrc", async (t) => {
 	const eik = join(__dirname, "..", "..", "index.js");
 	const cmd = `node ${eik} map-alias test-map 1.0.0 1
         --token ${t.context.token}
@@ -199,7 +197,7 @@ await test("map: eik alias <name> <version> <alias> --token --server : no eik.js
 	t.end();
 });
 
-await test("map: eik alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
+test("map: eik alias <name> <version> <alias> : publish details provided by eik.json file", async (t) => {
 	const assets = {
 		name: "test-app",
 		type: "map",
diff --git a/test/integration/package.test.mjs b/test/integration/package.test.mjs
index 36159707..aa99d14a 100644
--- a/test/integration/package.test.mjs
+++ b/test/integration/package.test.mjs
@@ -43,9 +43,7 @@ beforeEach(async (t) => {
 	t.context.token = token;
 });
 
-afterEach(async (t) => {
-	await t.context.server.close();
-});
+afterEach((t) => t.context.server.close());
 
 test("eik package : package, details provided by eik.json file", async (t) => {
 	const assets = {