diff --git a/dom/plugins/test/moz.build b/dom/plugins/test/moz.build
index 03e34e6356ac..ebc6825ca4ed 100644
--- a/dom/plugins/test/moz.build
+++ b/dom/plugins/test/moz.build
@@ -4,7 +4,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['testplugin', 'testaddon']
+DIRS += ['testplugin']
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
diff --git a/dom/plugins/test/testaddon/Makefile.in b/dom/plugins/test/testaddon/Makefile.in
deleted file mode 100644
index e3668a68a840..000000000000
--- a/dom/plugins/test/testaddon/Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/rules.mk
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-plugin_file_names = Test.plugin SecondTest.plugin ThirdTest.plugin npswftest.plugin
-else
-plugin_file_names = $(DLL_PREFIX)nptest$(DLL_SUFFIX) $(DLL_PREFIX)npsecondtest$(DLL_SUFFIX) $(DLL_PREFIX)npthirdtest$(DLL_SUFFIX) $(DLL_PREFIX)npswftest$(DLL_SUFFIX)
-endif
-
-# This is so hacky. Waiting on bug 988938.
-testdir = $(topobjdir)/_tests/xpcshell/dom/plugins/test/unit/
-addonpath = $(testdir)/testaddon.xpi
-
-libs::
-	$(NSINSTALL) -D $(testdir)
-	rm -f $(addonpath)
-	cd $(srcdir) && zip -rD $(addonpath) install.rdf
-	cd $(DIST) && zip -rD $(addonpath) $(foreach name,$(plugin_file_names),plugins/$(name))
diff --git a/dom/plugins/test/testaddon/install.rdf b/dom/plugins/test/testaddon/install.rdf
deleted file mode 100644
index 2dff1a4469ee..000000000000
--- a/dom/plugins/test/testaddon/install.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>test-plugin-from-xpi@tests.mozilla.org</em:id>
-    <em:version>1</em:version>
-    <em:name>Test plugin from XPI</em:name>
-    <em:description>This tests shipping a plugin through an extensions.</em:description>
-
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>0</em:minVersion>
-        <em:maxVersion>*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <em:unpack>true</em:unpack>
-    <em:multiprocessCompatible>true</em:multiprocessCompatible>
-
-  </Description>
-</RDF>
diff --git a/dom/plugins/test/testaddon/moz.build b/dom/plugins/test/testaddon/moz.build
deleted file mode 100644
index 568f361a5423..000000000000
--- a/dom/plugins/test/testaddon/moz.build
+++ /dev/null
@@ -1,5 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.