diff --git a/test/integration/agent-ca/agent-ca-test.js b/test/integration/agent-ca/agent-ca-test.js
index d22c5392..5f4f31ef 100644
--- a/test/integration/agent-ca/agent-ca-test.js
+++ b/test/integration/agent-ca/agent-ca-test.js
@@ -2,7 +2,7 @@ const https = require("https");
 const { readFileSync } = require("fs");
 const { resolve } = require("path");
 
-const Octokit = require("../../..");
+const { Octokit } = require("../../..");
 const ca = readFileSync(resolve(__dirname, "./ca.crt"));
 
 require("../../mocha-node-setup");
diff --git a/test/integration/apps-test.js b/test/integration/apps-test.js
index 5e080df2..9d33a0d0 100644
--- a/test/integration/apps-test.js
+++ b/test/integration/apps-test.js
@@ -1,6 +1,6 @@
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 const BEARER_TOKEN =
   "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1NTM4MTkzMTIsImV4cCI6MTU1MzgxOTM3MiwiaXNzIjoxfQ.etiSZ4LFQZ8tiMGJVqKDoGn8hxMCgwL4iLvU5xBUqbAPr4pbk_jJZmMQjuxTlOnRxq4e7NouTizGCdfohRMb3R1mpLzGPzOH9_jqSA_BWYxolsRP_WDSjuNcw6nSxrPRueMVRBKFHrqcTOZJej0djRB5pI61hDZJ_-DGtiOIFexlK3iuVKaqBkvJS5-TbTekGuipJ652g06gXuz-l8i0nHiFJldcuIruwn28hTUrjgtPbjHdSBVn_QQLKc2Fhij8OrhcGqp_D_fvb_KovVmf1X6yWiwXV5VXqWARS-JGD9JTAr2495ZlLV_E4WPxdDpz1jl6XS9HUhMuwBpaCOuipw";
 
diff --git a/test/integration/authentication-test.js b/test/integration/authentication-test.js
index 8d1c308e..f15236a1 100644
--- a/test/integration/authentication-test.js
+++ b/test/integration/authentication-test.js
@@ -2,7 +2,7 @@ const lolex = require("lolex");
 const nock = require("nock");
 const { createActionAuth, createAppAuth } = require("@octokit/auth");
 
-const Octokit = require("../..");
+const { Octokit } = require("../..");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/conditional-request-test.js b/test/integration/conditional-request-test.js
index 433e3706..f96e5658 100644
--- a/test/integration/conditional-request-test.js
+++ b/test/integration/conditional-request-test.js
@@ -1,6 +1,6 @@
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/deprecations-test.js b/test/integration/deprecations-test.js
index 17a705ed..db5fc131 100644
--- a/test/integration/deprecations-test.js
+++ b/test/integration/deprecations-test.js
@@ -1,7 +1,8 @@
 const btoa = require("btoa-lite");
 const nock = require("nock");
 
-const Octokit = require("../../");
+const DeprecatedOctokit = require("../../");
+const { Octokit } = DeprecatedOctokit;
 
 require("../mocha-node-setup");
 
@@ -10,6 +11,18 @@ const Mocktokit = Octokit.plugin(octokit => {
 });
 
 describe("deprecations", () => {
+  it('const Octokit = require("@octokit/rest")', () => {
+    let warnCalledCount = 0;
+    const octokit = new DeprecatedOctokit({
+      log: {
+        warn: deprecation => {
+          warnCalledCount++;
+        }
+      }
+    });
+
+    expect(warnCalledCount).to.equal(1);
+  });
   it("octokit.search.issues() has been renamed to octokit.search.issuesAndPullRequests() (2018-12-27)", () => {
     let warnCalledCount = 0;
     const octokit = new Mocktokit({
diff --git a/test/integration/pagination-test.js b/test/integration/pagination-test.js
index 871102ad..7060991a 100644
--- a/test/integration/pagination-test.js
+++ b/test/integration/pagination-test.js
@@ -1,6 +1,6 @@
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/params-validations-test.js b/test/integration/params-validations-test.js
index 3c2f5f54..38ef9570 100644
--- a/test/integration/params-validations-test.js
+++ b/test/integration/params-validations-test.js
@@ -1,6 +1,6 @@
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/plugins-test.js b/test/integration/plugins-test.js
index 8e57b07b..98ce1f12 100644
--- a/test/integration/plugins-test.js
+++ b/test/integration/plugins-test.js
@@ -1,4 +1,4 @@
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/register-endpoints-test.js b/test/integration/register-endpoints-test.js
index 207f2be2..483a7782 100644
--- a/test/integration/register-endpoints-test.js
+++ b/test/integration/register-endpoints-test.js
@@ -1,6 +1,6 @@
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/request-errors-test.js b/test/integration/request-errors-test.js
index ae633ce8..156fc37a 100644
--- a/test/integration/request-errors-test.js
+++ b/test/integration/request-errors-test.js
@@ -1,6 +1,6 @@
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/integration/smoke-test.js b/test/integration/smoke-test.js
index 8e80b18b..c6629f2c 100644
--- a/test/integration/smoke-test.js
+++ b/test/integration/smoke-test.js
@@ -1,7 +1,7 @@
 const nock = require("nock");
 const { getUserAgent } = require("universal-user-agent");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/1134-missing-endpoint-scopes-test.js b/test/issues/1134-missing-endpoint-scopes-test.js
index ef6d57a3..876f39e7 100644
--- a/test/issues/1134-missing-endpoint-scopes-test.js
+++ b/test/issues/1134-missing-endpoint-scopes-test.js
@@ -1,4 +1,4 @@
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/1279-store-otp-send-header-all-requests-test.js b/test/issues/1279-store-otp-send-header-all-requests-test.js
index 91f7acf7..85760153 100644
--- a/test/issues/1279-store-otp-send-header-all-requests-test.js
+++ b/test/issues/1279-store-otp-send-header-all-requests-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/1323-parameter-deprecation-bug-test.js b/test/issues/1323-parameter-deprecation-bug-test.js
index 29c8ab5b..68b4792e 100644
--- a/test/issues/1323-parameter-deprecation-bug-test.js
+++ b/test/issues/1323-parameter-deprecation-bug-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../..");
+const { Octokit } = require("../..");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/1497-include-error-message-on-validation-error-test.js b/test/issues/1497-include-error-message-on-validation-error-test.js
index e34a6292..0f42c5ef 100644
--- a/test/issues/1497-include-error-message-on-validation-error-test.js
+++ b/test/issues/1497-include-error-message-on-validation-error-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/1553-deprecated-teams-methods-test.js b/test/issues/1553-deprecated-teams-methods-test.js
index bbf0c45a..dc724846 100644
--- a/test/issues/1553-deprecated-teams-methods-test.js
+++ b/test/issues/1553-deprecated-teams-methods-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/765-remove-milestone-from-issue-test.js b/test/issues/765-remove-milestone-from-issue-test.js
index 83ac9fc2..0d7f4239 100644
--- a/test/issues/765-remove-milestone-from-issue-test.js
+++ b/test/issues/765-remove-milestone-from-issue-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/818-get-installations-test.js b/test/issues/818-get-installations-test.js
index 62c256e3..bb74186f 100644
--- a/test/issues/818-get-installations-test.js
+++ b/test/issues/818-get-installations-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/826-fail-on-304-test.js b/test/issues/826-fail-on-304-test.js
index ed4e6651..276c17f6 100644
--- a/test/issues/826-fail-on-304-test.js
+++ b/test/issues/826-fail-on-304-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/841-head-request-test.js b/test/issues/841-head-request-test.js
index ee5dd4cf..4957ea31 100644
--- a/test/issues/841-head-request-test.js
+++ b/test/issues/841-head-request-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/861-custom-accept-header-test.js b/test/issues/861-custom-accept-header-test.js
index 3481eb68..dd841234 100644
--- a/test/issues/861-custom-accept-header-test.js
+++ b/test/issues/861-custom-accept-header-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/881-redirect-url-test.js b/test/issues/881-redirect-url-test.js
index ca2946ce..ce1676e0 100644
--- a/test/issues/881-redirect-url-test.js
+++ b/test/issues/881-redirect-url-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/issues/922-create-check-with-empty-actions-array-test.js b/test/issues/922-create-check-with-empty-actions-array-test.js
index 0c17894f..342bcc2b 100644
--- a/test/issues/922-create-check-with-empty-actions-array-test.js
+++ b/test/issues/922-create-check-with-empty-actions-array-test.js
@@ -1,5 +1,5 @@
 const nock = require("nock");
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 require("../mocha-node-setup");
 
diff --git a/test/memory-test.js b/test/memory-test.js
index 96f464f1..072d9407 100644
--- a/test/memory-test.js
+++ b/test/memory-test.js
@@ -2,7 +2,7 @@
 // as installing leakage broke for recent Node versions.
 // We are looking for an alternative.
 const { iterate } = require("leakage");
-const Octokit = require("../");
+const { Octokit } = require("../");
 
 const TestOctokit = Octokit.plugin(octokit => {
   // skip sending requests altogether
diff --git a/test/unit/upload-asset-test.js b/test/unit/upload-asset-test.js
index 0b58158d..046af682 100644
--- a/test/unit/upload-asset-test.js
+++ b/test/unit/upload-asset-test.js
@@ -3,7 +3,7 @@ const fs = require("fs");
 const chai = require("chai");
 const nock = require("nock");
 
-const Octokit = require("../../");
+const { Octokit } = require("../../");
 
 chai.should();
 
diff --git a/test/util.js b/test/util.js
index e045e2af..90c8d445 100644
--- a/test/util.js
+++ b/test/util.js
@@ -4,7 +4,7 @@ module.exports = {
   getInstance
 };
 
-const Octokit = require("../");
+const { Octokit } = require("../");
 const { request } = require("@octokit/request");
 
 function loadFixture(scenario) {