--- a/mail/test/mozmill/shared-modules/test-account-manager-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-account-manager-helpers.js
@@ -3,22 +3,16 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const MODULE_NAME = "account-manager-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 // we need this for the main controller
 const MODULE_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
-var elib = {};
-Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
-var EventUtils = {};
-Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
 var utils = {};
 Cu.import('resource://mozmill/modules/utils.js', utils);
 
 var wh, fdh, mc;
 
 function setupModule() {
   fdh = collector.getModule('folder-display-helpers');
   mc = fdh.mc;

--- a/mail/test/mozmill/shared-modules/test-compose-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-compose-helpers.js
@@ -7,18 +7,16 @@ const MODULE_NAME = "compose-helpers";
 const RELATIVE_ROOT = "../shared-modules";
 // we need this for the main controller
 const MODULE_REQUIRES = ["folder-display-helpers",
                          "window-helpers",
                          "dom-helpers"];
 
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var utils = {};
 Cu.import('resource://mozmill/modules/utils.js', utils);
 
 const kTextNodeType = 3;
 
 var folderDisplayHelper;
 var mc;
 var windowHelper, domHelper;

--- a/mail/test/mozmill/shared-modules/test-content-tab-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-content-tab-helpers.js
@@ -7,18 +7,16 @@ const MODULE_NAME = "content-tab-helpers
 const RELATIVE_ROOT = "../shared-modules";
 // we need this for the main controller
 const MODULE_REQUIRES = ["folder-display-helpers",
                          "window-helpers",
                          "mock-object-helpers"];
 
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var utils = {};
 Cu.import('resource://mozmill/modules/utils.js', utils);
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 
 const NORMAL_TIMEOUT = 6000;
 const FAST_TIMEOUT = 1000;
 const FAST_INTERVAL = 100;

--- a/mail/test/mozmill/shared-modules/test-customization-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-customization-helpers.js
@@ -5,22 +5,16 @@
 const MODULE_NAME = "customization-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 const MODULE_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
 Cu.import("resource://gre/modules/Services.jsm");
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
-var EventUtils = {};
-Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
-var controller = {};
-Cu.import('resource://mozmill/modules/controller.js', controller);
 
 const USE_SHEET_PREF = "toolbar.customization.usesheet";
 
 var wh, fdh;
 
 function setupModule() {
   fdh = collector.getModule('folder-display-helpers');
   wh = collector.getModule('window-helpers');

--- a/mail/test/mozmill/shared-modules/test-dom-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-dom-helpers.js
@@ -5,22 +5,16 @@
 const MODULE_NAME = "dom-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 // we need this for the main controller
 const MODULE_REQUIRES = ["folder-display-helpers"];
 
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
-var controller = {};
-Cu.import('resource://mozmill/modules/controller.js', controller);
-var utils = {};
-Cu.import('resource://mozmill/modules/utils.js', utils);
 
 const NORMAL_TIMEOUT = 6000;
 const FAST_TIMEOUT = 1000;
 const FAST_INTERVAL = 100;
 
 var folderDisplayHelper;
 var mc;
 

--- a/mail/test/mozmill/shared-modules/test-folder-display-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-folder-display-helpers.js
@@ -3,22 +3,18 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const MODULE_NAME = "folder-display-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 // we need window-helpers for augment_controller
 const MODULE_REQUIRES = ["window-helpers"];
 
-var elib = {};
-Cu.import('resource://mozmill/modules/elementslib.js', elib);
 var EventUtils = {};
 Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var controller = {};
 Cu.import('resource://mozmill/modules/controller.js', controller);
 var frame = {};
 Cu.import('resource://mozmill/modules/frame.js', frame);
 var os = {};
 Cu.import('resource://mozmill/stdlib/os.js', os);
 var utils = {};
 Cu.import('resource://mozmill/modules/utils.js', utils);
@@ -47,17 +43,17 @@ const FAKE_SERVER_HOSTNAME = 'tinderbox1
 /**
  * List of keys not to export via installInto; values do not matter, we just
  *  use true.
  */
 const DO_NOT_EXPORT = {
   // magic globals
   MODULE_NAME: true, DO_NOT_EXPORT: true, installInto: true,
   // imported modules
-  elib: true, mozmill: true, controller: true, frame: true, os: true,
+  controller: true, frame: true, os: true,
   // useful constants (we do export MailViewConstants)
   nsMsgViewIndex_None: true, MailConsts: true,
   // utility functions
   MailUtils: true, MailViewManager: true,
   // internal setup functions
   setupModule: true, setupAccountStuff: true,
   // we export this separately
   teardownImporter: true,

--- a/mail/test/mozmill/shared-modules/test-junk-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-junk-helpers.js
@@ -5,18 +5,16 @@
 const MODULE_NAME = "junk-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 // we need this for the main controller
 const MODULE_REQUIRES = ["folder-display-helpers"];
 
 var elib = {};
 Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var utils = {};
 Cu.import("resource://mozmill/modules/utils.js", utils);
 
 var folderDisplayHelper;
 var mc;
 
 // logHelper (and therefore folderDisplayHelper) exports
 var mark_failure;

--- a/mail/test/mozmill/shared-modules/test-mouse-event-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-mouse-event-helpers.js
@@ -2,20 +2,16 @@
  * 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/. */
 
 const MODULE_NAME = "mouse-event-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 const MODULE_REQUIRES = ["folder-display-helpers"];
 
-var elib = {};
-Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
 var EventUtils = {};
 Cu.import('resource://mozmill/stdlib/EventUtils.js', EventUtils);
 
 var fdh;
 
 function setupModule() {
   fdh = collector.getModule('folder-display-helpers');
 }

--- a/mail/test/mozmill/shared-modules/test-nntp-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-nntp-helpers.js
@@ -5,21 +5,16 @@
 const MODULE_NAME = "nntp-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 const MODULES_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource:///modules/mailServices.js");
 
-var elib = {};
-Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
-
 const kSimpleNewsArticle =
   "From: John Doe <john.doe@example.com>\n"+
   "Date: Sat, 24 Mar 1990 10:59:24 -0500\n"+
   "Newsgroups: test.subscribe.simple\n"+
   "Subject: H2G2 -- What does it mean?\n"+
   "Message-ID: <TSS1@nntp.invalid>\n"+
   "\n"+
   "What does the acronym H2G2 stand for? I've seen it before...\n";

--- a/mail/test/mozmill/shared-modules/test-search-window-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-search-window-helpers.js
@@ -2,21 +2,16 @@
  * 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/. */
 
 const MODULE_NAME = "search-window-helpers";
 
 const RELATIVE_ROOT = "../shared-modules";
 const MODULE_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
-var elib = {};
-Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
-
 var folderDisplayHelper;
 var mc;
 var windowHelper;
 
 function setupModule() {
   folderDisplayHelper = collector.getModule('folder-display-helpers');
   mc = folderDisplayHelper.mc;
   windowHelper = collector.getModule('window-helpers');

--- a/mail/test/mozmill/shared-modules/test-subscribe-window-helper.js
+++ b/mail/test/mozmill/shared-modules/test-subscribe-window-helper.js
@@ -2,21 +2,16 @@
  * 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/. */
 
 const MODULE_NAME = "subscribe-window-helpers";
 const RELATIVE_ROOT = "../shared-modules";
 const MODULE_REQUIRES = ['window-helpers', 'folder-display-helpers',
                          'keyboard-helpers'];
 
-var elib = {};
-Cu.import('resource://mozmill/modules/elementslib.js', elib);
-var mozmill = {};
-Cu.import('resource://mozmill/modules/mozmill.js', mozmill);
-
 var folderDisplayHelper;
 var mc;
 var windowHelper;
 var kh;
 
 function setupModule() {
   folderDisplayHelper = collector.getModule('folder-display-helpers');
   mc = folderDisplayHelper.mc;