--- a/addon-sdk/Makefile.in
+++ b/addon-sdk/Makefile.in
@@ -1,32 +1,21 @@
 # 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/.
 
 TESTADDONS = source/test/addons
 ADDONSRC = $(srcdir)/$(TESTADDONS)
-TESTROOT = $(CURDIR)/$(DEPTH)/_tests/testing/mochitest/jetpack-addon/$(relativesrcdir)/$(TESTADDONS)
-
-# Build a list of the test add-ons
-ADDONS = $(patsubst $(ADDONSRC)/%/package.json,$(TESTADDONS)/%.xpi,$(wildcard $(ADDONSRC)/*/package.json))
-
-INSTALL_TARGETS += test_addons
-test_addons_FILES = $(ADDONS)
-test_addons_DEST = $(TESTROOT)
-test_addons_TARGET := misc
 
 sinclude $(topsrcdir)/config/rules.mk
 
 # This can switch to just zipping the files when native jetpacks land
 $(TESTADDONS)/%.xpi: FORCE $(call mkdir_deps,$(CURDIR)/$(TESTADDONS)) $(ADDONSRC)/%
 	$(PYTHON) $(srcdir)/source/bin/cfx xpi --no-strip-xpi --pkgdir=$(lastword $^) --output-file=$@
 
-#libs:: $(ADDONS)
-
 TEST_FILES = \
   $(srcdir)/source/app-extension \
   $(srcdir)/source/bin \
   $(srcdir)/source/python-lib \
   $(srcdir)/source/test \
   $(srcdir)/source/package.json \
   $(srcdir)/source/mapping.json \
   $(NULL)

--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -11,16 +11,65 @@
 
 # Makefile.in uses a misc target through test_addons_TARGET.
 HAS_MISC_RULE = True
 
 BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
 JETPACK_PACKAGE_MANIFESTS += ['source/test/jetpack-package.ini']
 JETPACK_ADDON_MANIFESTS += ['source/test/addons/jetpack-addon.ini']
 
+addons = [
+    'addon-manager',
+    'author-email',
+    'child_process',
+    'chrome',
+    'content-permissions',
+    'contributors',
+    'curly-id',
+    'developers',
+    'e10s-content',
+    'e10s-l10n',
+    'e10s-remote',
+    'e10s-tabs',
+    'e10s',
+    'l10n-properties',
+    'l10n',
+    'layout-change',
+    'main',
+    'name-in-numbers-plus',
+    'name-in-numbers',
+    'packaging',
+    'packed',
+    'page-mod-debugger-post',
+    'page-mod-debugger-pre',
+    'page-worker',
+    'places',
+    'predefined-id-with-at',
+    'preferences-branch',
+    'private-browsing-supported',
+    'remote',
+    'require',
+    'self',
+    'simple-prefs-l10n',
+    'simple-prefs-regression',
+    'simple-prefs',
+    'standard-id',
+    'tab-close-on-startup',
+    'toolkit-require-reload',
+    'translators',
+    'unsafe-content-script',
+]
+
+addons = ['source/test/addons/%s.xpi' % f for f in addons]
+GENERATED_FILES += addons
+
+TEST_HARNESS_FILES.testing.mochitest['jetpack-addon']['addon-sdk'].source.test.addons += [
+    '!%s' % f for f in addons
+]
+
 EXTRA_JS_MODULES.sdk += [
     'source/app-extension/bootstrap.js',
 ]
 
 EXTRA_JS_MODULES.sdk.system += [
     'source/modules/system/Startup.js',
 ]