--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -3,73 +3,20 @@
 # 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/.
 
 # 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',
-                              'source/test/leak/jetpack-package.ini']
-JETPACK_ADDON_MANIFESTS += ['source/test/addons/jetpack-addon.ini']
+JETPACK_PACKAGE_MANIFESTS += ['source/test/jetpack-package.ini']
 
 DIRS += ['source/test/fixtures']
 
-addons = [
-    'addon-manager',
-    'author-email',
-    'child_process',
-    'chrome',
-    'content-permissions',
-    'content-script-messages-latency',
-    'contributors',
-    'curly-id',
-    'developers',
-    'e10s-content',
-    'e10s-l10n',
-    'e10s-remote',
-    'e10s-tabs',
-    'e10s',
-    'embedded-webextension',
-    '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 = ['%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',
 ]
 

--- a/addon-sdk/source/test/jetpack-package.ini
+++ b/addon-sdk/source/test/jetpack-package.ini
@@ -1,182 +1,11 @@
 [DEFAULT]
 support-files =
-  buffers/**
-  commonjs-test-adapter/**
-  context-menu/**
-  event/**
-  fixtures.js
-  fixtures/**
+  fixtures/loader/**
   fixtures/native-addon-test.xpi
   fixtures/native-overrides-test.xpi
-  framescript-manager/**
-  framescript-util/**
-  lib/**
-  loader/**
-  modules/**
-  page-mod/**
-  path/**
-  private-browsing/**
-  querystring/**
-  sidebar/**
-  tabs/**
-  test-context-menu.html
-  traits/**
-  util.js
-  windows/**
-  zip/**
 generated-files =
   fixtures/native-addon-test.xpi
   fixtures/native-overrides-test.xpi
 
-[test-addon-bootstrap.js]
-[test-addon-extras.js]
-[test-addon-installer.js]
-[test-addon-window.js]
-[test-api-utils.js]
-[test-array.js]
-[test-base64.js]
-[test-bootstrap.js]
-[test-browser-events.js]
-[test-buffer.js]
-[test-byte-streams.js]
-[test-child_process.js]
-[test-chrome.js]
-[test-clipboard.js]
-subsuite = clipboard
-[test-collection.js]
-[test-commonjs-test-adapter.js]
-[test-content-events.js]
-[test-content-script.js]
-[test-content-sync-worker.js]
-[test-content-worker.js]
-[test-context-menu.js]
-skip-if = asan # Bug 1333359
-[test-context-menu@2.js]
-[test-cuddlefish.js]
-# Cuddlefish loader is unsupported
-skip-if = true
-[test-deprecate.js]
-[test-dev-panel.js]
-[test-diffpatcher.js]
-[test-dispatcher.js]
-[test-disposable.js]
-[test-dom.js]
-[test-environment.js]
-[test-event-core.js]
-[test-event-dom.js]
-[test-event-target.js]
-[test-event-utils.js]
-[test-file.js]
-[test-frame-utils.js]
-[test-framescript-manager.js]
-[test-framescript-util.js]
-[test-fs.js]
-[test-functional.js]
-[test-globals.js]
-[test-heritage.js]
-[test-hidden-frame.js]
-[test-host-events.js]
-[test-hotkeys.js]
-[test-httpd.js]
-[test-indexed-db.js]
-[test-jetpack-id.js]
-[test-keyboard-observer.js]
-[test-keyboard-utils.js]
-[test-l10n-locale.js]
-[test-l10n-plural-rules.js]
-[test-lang-type.js]
-[test-libxul.js]
-[test-list.js]
 [test-loader.js]
-[test-match-pattern.js]
-[test-method.js]
-[test-module.js]
-[test-modules.js]
-[test-mozilla-toolkit-versioning.js]
-[test-mpl2-license-header.js]
-skip-if = true
-[test-namespace.js]
 [test-native-loader.js]
-[test-native-options.js]
-[test-net-url.js]
-[test-node-os.js]
-[test-notifications.js]
-[test-object.js]
-[test-observers.js]
-[test-page-mod-debug.js]
-[test-page-mod.js]
-[test-page-worker.js]
-[test-panel.js]
-skip-if = asan # Bug 1333359
-[test-passwords-utils.js]
-[test-passwords.js]
-[test-path.js]
-[test-plain-text-console.js]
-[test-preferences-service.js]
-[test-preferences-target.js]
-[test-private-browsing.js]
-[test-promise.js]
-[test-querystring.js]
-[test-reference.js]
-[test-request.js]
-[test-require.js]
-[test-rules.js]
-[test-sandbox.js]
-[test-selection.js]
-[test-self.js]
-[test-sequence.js]
-[test-set-exports.js]
-[test-shared-require.js]
-[test-simple-prefs.js]
-[test-simple-storage.js]
-[test-system-events.js]
-[test-system-input-output.js]
-[test-system-runtime.js]
-[test-system-startup.js]
-[test-system.js]
-[test-tab-events.js]
-[test-tab-observer.js]
-[test-tab-utils.js]
-[test-tab.js]
-[test-tabs-common.js]
-[test-tabs.js]
-[test-test-addon-file.js]
-[test-test-assert.js]
-[test-test-loader.js]
-[test-test-memory.js]
-[test-test-utils-async.js]
-[test-test-utils-generator.js]
-[test-test-utils-sync.js]
-[test-test-utils.js]
-[test-text-streams.js]
-[test-timer.js]
-[test-traceback.js]
-[test-ui-action-button.js]
-skip-if = debug || asan # Bug 1208727
-[test-ui-frame.js]
-[test-ui-id.js]
-[test-ui-sidebar-private-browsing.js]
-[test-ui-sidebar.js]
-[test-ui-toggle-button.js]
-[test-ui-toolbar.js]
-[test-unit-test-finder.js]
-[test-unit-test.js]
-[test-unload.js]
-[test-unsupported-skip.js]
-# Bug 1037235
-skip-if = true
-[test-uri-resource.js]
-[test-url.js]
-[test-uuid.js]
-[test-weak-set.js]
-[test-window-events.js]
-[test-window-observer.js]
-[test-window-utils-private-browsing.js]
-[test-window-utils.js]
-[test-window-utils2.js]
-[test-windows-common.js]
-skip-if = asan # bug 1333357
-[test-windows.js]
-[test-xhr.js]
-[test-xpcom.js]
-[test-xul-app.js]

--- a/addon-sdk/test/browser.ini
+++ b/addon-sdk/test/browser.ini
@@ -1,15 +1,12 @@
 [DEFAULT]
 support-files =
   head.js
   Math.jsm
   math.js
   data.json
   invalid.json
 [browser_sdk_loader_sdk_modules.js]
-[browser_sdk_loader_sdk_gui_modules.js]
-skip-if = e10s # Bug 1315042
 [browser_sdk_loader_jsm_modules.js]
 [browser_sdk_loader_js_modules.js]
 [browser_sdk_loader_json.js]
 [browser_sdk_loader_chrome.js]
-[browser_sdk_loader_chrome_in_sdk.js]