diff -r 000000000000 -r 6474c204b198 toolkit/mozapps/extensions/test/xpcshell/test_general.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/mozapps/extensions/test/xpcshell/test_general.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,58 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/
+ */
+
+// This just verifies that the EM can actually startup and shutdown a few times
+// without any errors
+
+// We have to look up how many add-ons are present since there will be plugins
+// etc. detected
+var gCount;
+
+function run_test() {
+  do_test_pending();
+  createAppInfo("xpcshell@tests.mozilla.org", "XPCShell", "1", "1.9.2");
+
+  var count = 0;
+  startupManager();
+  AddonManager.getAddonsByTypes(null, function(list) {
+    gCount = list.length;
+
+    do_execute_soon(run_test_1);
+  });
+}
+
+function run_test_1() {
+  restartManager();
+
+  AddonManager.getAddonsByTypes(null, function(addons) {
+    do_check_eq(gCount, addons.length);
+
+    AddonManager.getAddonsWithOperationsByTypes(null, function(pendingAddons) {
+      do_check_eq(0, pendingAddons.length);
+
+      do_execute_soon(run_test_2);
+    });
+  });
+}
+
+function run_test_2() {
+  shutdownManager();
+
+  startupManager(false);
+
+  AddonManager.getAddonsByTypes(null, function(addons) {
+    do_check_eq(gCount, addons.length);
+
+    do_execute_soon(run_test_3);
+  });
+}
+
+function run_test_3() {
+  restartManager();
+
+  AddonManager.getAddonsByTypes(null, callback_soon(function(addons) {
+    do_check_eq(gCount, addons.length);
+    do_test_finished();
+  }));
+}