--- a/devtools/shim/moz.build
+++ b/devtools/shim/moz.build
@@ -22,8 +22,9 @@ if CONFIG['MOZ_DEVTOOLS'] != 'server':
     ]
 
     DIRS += [
       'aboutdevtools',
       'locales',
     ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+BROWSER_CHROME_MANIFESTS += ['tests/browser/browser.ini']

new file mode 100644
--- /dev/null
+++ b/devtools/shim/tests/browser/.eslintrc.js
@@ -0,0 +1,6 @@
+"use strict";
+
+module.exports = {
+  // Extend from the shared list of defined globals for mochitests.
+  "extends": "../../../.eslintrc.mochitests.js"
+};

new file mode 100644
--- /dev/null
+++ b/devtools/shim/tests/browser/browser.ini
@@ -0,0 +1,5 @@
+[DEFAULT]
+tags = devtools
+subsuite = devtools
+
+[browser_shim_disable_devtools.js]

new file mode 100644
--- /dev/null
+++ b/devtools/shim/tests/browser/browser_shim_disable_devtools.js
@@ -0,0 +1,86 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/* eslint-env browser */
+
+const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
+const { gDevTools } = require("devtools/client/framework/devtools");
+
+/**
+ * Test that the preference devtools.policy.disabled disables entry points for devtools.
+ */
+add_task(async function () {
+  info("Disable DevTools entry points (does not apply to the already created window");
+  new Promise(resolve => {
+    let options = {"set": [["devtools.policy.disabled", true]]};
+    SpecialPowers.pushPrefEnv(options, resolve);
+  });
+
+  info("Open a new window, all window-specific hooks for DevTools will be disabled.");
+  let win = OpenBrowserWindow({private: false});
+  await waitForDelayedStartupFinished(win);
+
+  info("Synthesize a DevTools shortcut, the toolbox should not open on this new window.");
+  synthesizeToggleToolboxKey(win);
+
+  // There is no event to wait for here as this shortcut should have no effect.
+  /* eslint-disable mozilla/no-arbitrary-setTimeout */
+  await new Promise(r => setTimeout(r, 1000));
+
+  is(gDevTools._toolboxes.size, 0, "No toolbox has been opened");
+
+  let browser = gBrowser.selectedTab.linkedBrowser;
+  let location = browser.documentURI.spec;
+  ok(!location.startsWith("about:devtools"), "The current tab is not about:devtools");
+
+  info("Open the context menu for the content page.");
+  let contextMenu = win.document.getElementById("contentAreaContextMenu");
+  let popupShownPromise = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
+  EventUtils.synthesizeMouseAtCenter(win.document.documentElement,
+    { type: "contextmenu", button: 2 }, win);
+  await popupShownPromise;
+
+  let inspectElementItem = contextMenu.querySelector(`#context-inspect`);
+  ok(inspectElementItem.hidden, "The inspect element item is hidden in the context menu");
+
+  info("Close the context menu");
+  let onContextMenuHidden = BrowserTestUtils.waitForEvent(contextMenu, "popuphidden");
+  contextMenu.hidePopup();
+  await onContextMenuHidden;
+
+  let toolsMenu = win.document.getElementById("webDeveloperMenu");
+  ok(toolsMenu.hidden, "The Web Developer item of the tools menu is hidden");
+  let hamburgerMenu = win.document.getElementById("appMenu-developer-button");
+  ok(hamburgerMenu.hidden, "The Web Developer item of the hamburger menu is hidden");
+
+  info("Close the test window");
+  let winClosed = BrowserTestUtils.windowClosed(win);
+  win.BrowserTryToCloseWindow();
+  await winClosed;
+});
+
+function waitForDelayedStartupFinished(win) {
+  return new Promise(resolve => {
+    Services.obs.addObserver(function observer(subject, topic) {
+      if (win == subject) {
+        Services.obs.removeObserver(observer, topic);
+        resolve();
+      }
+    }, "browser-delayed-startup-finished");
+  });
+}
+
+/**
+ * Helper to call the toggle devtools shortcut.
+ */
+function synthesizeToggleToolboxKey(win) {
+  info("Trigger the toogle toolbox shortcut");
+  if (Services.appinfo.OS == "Darwin") {
+    EventUtils.synthesizeKey("i", { accelKey: true, altKey: true }, win);
+  } else {
+    EventUtils.synthesizeKey("i", { accelKey: true, shiftKey: true }, win);
+  }
+}