diff -r 000000000000 -r 6474c204b198 addon-sdk/source/test/test-cuddlefish.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/addon-sdk/source/test/test-cuddlefish.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,47 @@
+/* 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/. */
+
+'use strict';
+
+const { Loader, Require, unload, override } = require('sdk/loader/cuddlefish');
+const packaging = require('@loader/options');
+
+exports['test loader'] = function(assert) {
+  var prints = [];
+  function print(message) {
+    prints.push(message);
+  }
+
+  let loader = Loader(override(packaging, {
+    globals: {
+      print: print,
+      foo: 1
+    }
+  }));
+  let require = Require(loader, module);
+
+  var fixture = require('./loader/fixture');
+
+  assert.equal(fixture.foo, 1, 'custom globals must work.');
+  assert.equal(fixture.bar, 2, 'exports are set');
+
+  assert.equal(prints[0], 'testing', 'global print must be injected.');
+
+  var unloadsCalled = '';
+
+  require("sdk/system/unload").when(function(reason) {
+    assert.equal(reason, 'test', 'unload reason is passed');
+    unloadsCalled += 'a';
+  });
+  require('sdk/system/unload.js').when(function() {
+    unloadsCalled += 'b';
+  });
+
+  unload(loader, 'test');
+
+  assert.equal(unloadsCalled, 'ba',
+               'loader.unload() must call listeners in LIFO order.');
+};
+
+require('test').run(exports);