diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js
index 8634d2f5c42..2497dd4462a 100644
--- a/browser/base/content/nsContextMenu.js
+++ b/browser/base/content/nsContextMenu.js
@@ -1288,7 +1288,7 @@ nsContextMenu.prototype = {
   },
 
   playPlugin: function() {
-    gPluginHandler._showClickToPlayNotification(this.browser, this.target);
+    gPluginHandler.activateSinglePlugin(this.target.ownerDocument.defaultView.top, this.target);
   },
 
   hidePlugin: function() {
diff --git a/browser/base/content/test/Makefile.in b/browser/base/content/test/Makefile.in
index b4722945409..cefbe50bfdd 100644
--- a/browser/base/content/test/Makefile.in
+++ b/browser/base/content/test/Makefile.in
@@ -196,7 +196,6 @@ MOCHITEST_BROWSER_FILES = \
                  browser_clearplugindata.js \
                  browser_contentAreaClick.js \
                  browser_contextSearchTabPosition.js \
-                 browser_CTP_context_menu.js \
                  browser_CTP_drag_drop.js \
                  browser_CTP_data_urls.js \
                  browser_ctrlTab.js \
diff --git a/browser/base/content/test/browser_CTP_context_menu.js b/browser/base/content/test/browser_CTP_context_menu.js
deleted file mode 100644
index 3dcff2b8b2b..00000000000
--- a/browser/base/content/test/browser_CTP_context_menu.js
+++ /dev/null
@@ -1,103 +0,0 @@
-var rootDir = getRootDirectory(gTestPath);
-const gTestRoot = rootDir;
-const gHttpTestRoot = rootDir.replace("chrome://mochitests/content/", "http://127.0.0.1:8888/");
-
-var gTestBrowser = null;
-var gNextTest = null;
-var gPluginHost = Components.classes["@mozilla.org/plugin/host;1"].getService(Components.interfaces.nsIPluginHost);
-
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-function test() {
-  waitForExplicitFinish();
-  registerCleanupFunction(function() {
-    clearAllPluginPermissions();
-    Services.prefs.clearUserPref("extensions.blocklist.suppressUI");
-    getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_ENABLED;
-  });
-  Services.prefs.setBoolPref("extensions.blocklist.suppressUI", true);
-
-  let newTab = gBrowser.addTab();
-  gBrowser.selectedTab = newTab;
-  gTestBrowser = gBrowser.selectedBrowser;
-  gTestBrowser.addEventListener("load", pageLoad, true);
-
-  Services.prefs.setBoolPref("plugins.click_to_play", true);
-  getTestPlugin().enabledState = Ci.nsIPluginTag.STATE_CLICKTOPLAY;
-
-  prepareTest(runAfterPluginBindingAttached(test1), gHttpTestRoot + "plugin_test.html");
-}
-
-function finishTest() {
-  clearAllPluginPermissions();
-  gTestBrowser.removeEventListener("load", pageLoad, true);
-  gBrowser.removeCurrentTab();
-  window.focus();
-  finish();
-}
-
-function pageLoad() {
-  // The plugin events are async dispatched and can come after the load event
-  // This just allows the events to fire before we then go on to test the states
-  executeSoon(gNextTest);
-}
-
-function prepareTest(nextTest, url) {
-  gNextTest = nextTest;
-  gTestBrowser.contentWindow.location = url;
-}
-
-// Due to layout being async, "PluginBindAttached" may trigger later.
-// This wraps a function to force a layout flush, thus triggering it,
-// and schedules the function execution so they're definitely executed
-// afterwards.
-function runAfterPluginBindingAttached(func) {
-  return function() {
-    let doc = gTestBrowser.contentDocument;
-    let elems = doc.getElementsByTagName('embed');
-    if (elems.length < 1) {
-      elems = doc.getElementsByTagName('object');
-    }
-    elems[0].clientTop;
-    executeSoon(func);
-  };
-}
-
-// Test that the activate action in content menus for CTP plugins works
-function test1() {
-  let popupNotification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
-  ok(popupNotification, "Test 1, Should have a click-to-play notification");
-
-  let plugin = gTestBrowser.contentDocument.getElementById("test");
-  let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
-  ok(!objLoadingContent.activated, "Test 1, Plugin should not be activated");
-
-  window.document.addEventListener("popupshown", test2, false);
-  EventUtils.synthesizeMouseAtCenter(plugin,
-                                     { type: "contextmenu", button: 2 },
-                                     gTestBrowser.contentWindow);
-}
-
-function test2() {
-  window.document.removeEventListener("popupshown", test2, false);
-  let activate = window.document.getElementById("context-ctp-play");
-  ok(activate, "Test 2, Should have a context menu entry for activating the plugin");
-
-  // Trigger the click-to-play popup
-  activate.doCommand();
-
-  let notification = PopupNotifications.getNotification("click-to-play-plugins", gTestBrowser);
-  ok(notification, "Test 2, Should have a click-to-play notification");
-  ok(!notification.dismissed, "Test 2, The click-to-play notification should not be dismissed");
-
-  // Activate the plugin
-  PopupNotifications.panel.firstChild._primaryButton.click();
-
-  let plugin = gTestBrowser.contentDocument.getElementById("test");
-  let objLoadingContent = plugin.QueryInterface(Ci.nsIObjectLoadingContent);
-  waitForCondition(() => objLoadingContent.activated, test3, "Waited too long for plugin to activate");
-}
-
-function test3() {
-  finishTest();
-}