diff --git a/package.json b/package.json
index 722c654e5..eb38503e1 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   "main": "index.js",
   "scripts": {
     "start": "probot run ./index.js",
-    "test": "tap test/**/*-test.js --timeout 240",
+    "test": "tap test/**/*-test.js",
     "posttest": "npm run lint",
     "coverage-report": "npx tap report --coverage-report lcov",
     "lint": "prettier --check '{lib,test}/**/*.{js,json,ts}' index.js *.md package.json",
diff --git a/test/integration/free-plan-test.js b/test/integration/free-plan-test.js
index eeb550966..340d208ac 100644
--- a/test/integration/free-plan-test.js
+++ b/test/integration/free-plan-test.js
@@ -31,10 +31,13 @@ beforeEach(async () => {
   probot = new Probot({
     id: 1,
     githubToken: "test",
-    Octokit: ProbotOctokit.defaults({
-      throttle: { enabled: false },
-      retry: { enabled: false },
-      log: pino(streamLogsToOutput),
+    Octokit: ProbotOctokit.defaults((instanceOptions) => {
+      return {
+        ...instanceOptions,
+        throttle: { enabled: false },
+        retry: { enabled: false },
+        log: pino(streamLogsToOutput),
+      };
     }),
     log: pino(streamLogsToOutput),
   });
diff --git a/test/integration/installation-test.js b/test/integration/installation-test.js
index dd586a2c5..911219c1a 100644
--- a/test/integration/installation-test.js
+++ b/test/integration/installation-test.js
@@ -30,10 +30,13 @@ beforeEach(function () {
   probot = new Probot({
     id: 1,
     githubToken: "test",
-    Octokit: ProbotOctokit.defaults({
-      throttle: { enabled: false },
-      retry: { enabled: false },
-      log: pino(streamLogsToOutput),
+    Octokit: ProbotOctokit.defaults((instanceOptions) => {
+      return {
+        ...instanceOptions,
+        throttle: { enabled: false },
+        retry: { enabled: false },
+        log: pino(streamLogsToOutput),
+      };
     }),
     log: pino(streamLogsToOutput),
   });
diff --git a/test/integration/marketplace-purchase-test.js b/test/integration/marketplace-purchase-test.js
index f0b173808..75d47b601 100644
--- a/test/integration/marketplace-purchase-test.js
+++ b/test/integration/marketplace-purchase-test.js
@@ -30,10 +30,13 @@ beforeEach(function () {
   probot = new Probot({
     id: 1,
     githubToken: "test",
-    Octokit: ProbotOctokit.defaults({
-      throttle: { enabled: false },
-      retry: { enabled: false },
-      log: pino(streamLogsToOutput),
+    Octokit: ProbotOctokit.defaults((instanceOptions) => {
+      return {
+        ...instanceOptions,
+        throttle: { enabled: false },
+        retry: { enabled: false },
+        log: pino(streamLogsToOutput),
+      };
     }),
     log: pino(streamLogsToOutput),
   });
diff --git a/test/integration/pro-plan-test.js b/test/integration/pro-plan-test.js
index 44aaa9d2f..31b363c9d 100644
--- a/test/integration/pro-plan-test.js
+++ b/test/integration/pro-plan-test.js
@@ -30,10 +30,13 @@ beforeEach(function () {
   probot = new Probot({
     id: 1,
     githubToken: "test",
-    Octokit: ProbotOctokit.defaults({
-      throttle: { enabled: false },
-      retry: { enabled: false },
-      log: pino(streamLogsToOutput),
+    Octokit: ProbotOctokit.defaults((instanceOptions) => {
+      return {
+        ...instanceOptions,
+        throttle: { enabled: false },
+        retry: { enabled: false },
+        log: pino(streamLogsToOutput),
+      };
     }),
     log: pino(streamLogsToOutput),
   });