--- a/mail/test/mozmill/moz.build
+++ b/mail/test/mozmill/moz.build
@@ -5,12 +5,38 @@
 
 TEST_HARNESS_FILES.mozmill += [
     'mozmilltests.list',
     'runtest.py',
     'runtestlist.py',
 ]
 
 TEST_HARNESS_FILES.mozmill.resources += [
-    '/%s/mail/base/test/unit/resources/**' % CONFIG['commreltopsrcdir'],
-    '/%s/mailnews/test/fakeserver/**' % CONFIG['commreltopsrcdir'],
-    '/%s/mailnews/test/resources/**' % CONFIG['commreltopsrcdir']
+    '/{}/mail/base/test/unit/resources/viewWrapperTestUtils.js'.format(CONFIG['commreltopsrcdir']),
 ]
+
+
+def mailnews_files(files, comm=CONFIG['commreltopsrcdir']):
+    return [
+        '/{comm}/mailnews/{file}'.format(
+            comm=comm,
+            file=file,
+        ) for file in files
+    ]
+
+TEST_HARNESS_FILES.mozmill.fakeserver += mailnews_files([
+    'test/fakeserver/auth.js',
+    'test/fakeserver/imapd.js',
+    'test/fakeserver/maild.js',
+    'test/fakeserver/nntpd.js',
+    'test/fakeserver/pop3d.js',
+    'test/fakeserver/smtpd.js',
+])
+
+
+TEST_HARNESS_FILES.mozmill.resources += mailnews_files([
+    'test/resources/asyncTestUtils.js',
+    'test/resources/folderEventLogHelper.js',
+    'test/resources/logHelper.js',
+    'test/resources/messageGenerator.js',
+    'test/resources/messageInjection.js',
+    'test/resources/messageModifier.js',
+])

--- a/mail/test/mozmill/shared-modules/test-folder-display-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-folder-display-helpers.js
@@ -24,21 +24,20 @@ Cu.import("resource:///modules/gloda/log
 var nsMsgViewIndex_None = 0xffffffff;
 Cu.import('resource:///modules/MailConsts.js');
 Cu.import("resource:///modules/mailServices.js");
 Cu.import('resource:///modules/MailUtils.js');
 Cu.import('resource:///modules/mailViewManager.js');
 Cu.import("resource://gre/modules/Services.jsm");
 
 var FILE_LOAD_PATHS = [
-  "../resources",
-  "../../resources",
-  "../../../../mailnews/test/resources",
-  "../../../../mail/base/test/unit/resources",
-  "../../../../mailnews/test/fakeserver"
+  "../",
+  "../../",
+  "../../../../mailnews/test/",
+  "../../../../mail/base/test/unit/",
 ];
 
 /**
  * Server hostname as set in runtest.py
  */
 var FAKE_SERVER_HOSTNAME = 'tinderbox123';
 
 /**
@@ -111,17 +110,17 @@ function setupModule() {
     do_check_neq: function() {},
     gDEPTH: "../../",
   };
 
   // -- logging
 
   // The xpcshell test resources assume they are loaded into a single global
   //  namespace, so we need to help them out to maintain their delusion.
-  load_via_src_path('logHelper.js', testHelperModule);
+  load_via_src_path('resources/logHelper.js', testHelperModule);
   mark_action = testHelperModule.mark_action;
   mark_failure = testHelperModule.mark_failure;
 
   // Remove the dump appender that got appended; it just adds noise.
   testHelperModule._mailnewsTestLogger.removeAppender(
     testHelperModule._mailnewsTestLogger.ownAppenders[
       testHelperModule._mailnewsTestLogger.ownAppenders.length - 1]);
 
@@ -195,24 +194,24 @@ function setupModule() {
       catch(ex) {
         dump("!!!!!!!!EX: " + ex);
         mark_action("fdh", "fail fail marking!", [ex]);
       }
     });
 
   // -- the rest of the asyncTestUtils framework (but not actually async)
 
-  load_via_src_path('asyncTestUtils.js', testHelperModule);
-  load_via_src_path('messageGenerator.js', testHelperModule);
-  load_via_src_path('messageModifier.js', testHelperModule);
-  load_via_src_path('messageInjection.js', testHelperModule);
-  load_via_src_path('viewWrapperTestUtils.js', testHelperModule);
+  load_via_src_path('resources/asyncTestUtils.js', testHelperModule);
+  load_via_src_path('resources/messageGenerator.js', testHelperModule);
+  load_via_src_path('resources/messageModifier.js', testHelperModule);
+  load_via_src_path('resources/messageInjection.js', testHelperModule);
+  load_via_src_path('resources/viewWrapperTestUtils.js', testHelperModule);
 
   // provide super helpful folder event info (when logHelper cares)
-  load_via_src_path('folderEventLogHelper.js', testHelperModule);
+  load_via_src_path('resources/folderEventLogHelper.js', testHelperModule);
   testHelperModule.registerFolderEventLogHelper();
 
   // messageInjection wants a gMessageGenerator (and so do we)
   msgGen = new testHelperModule.MessageGenerator();
   testHelperModule.gMessageGenerator = msgGen;
   testHelperModule.gMessageScenarioFactory =
     new testHelperModule.MessageScenarioFactory(msgGen);
 

--- a/mail/test/mozmill/shared-modules/test-nntp-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-nntp-helpers.js
@@ -44,18 +44,18 @@ function setupModule() {
     // fake some xpcshell stuff
     _TEST_FILE: ["mozmill"],
     do_throw: function(aMsg) {
       throw new Error(aMsg);
     },
     do_check_eq: function() {},
     do_check_neq: function() {},
   };
-  folderDisplayHelper.load_via_src_path("nntpd.js", testHelperModule);
-  folderDisplayHelper.load_via_src_path("maild.js", testHelperModule);
+  folderDisplayHelper.load_via_src_path("fakeserver/nntpd.js", testHelperModule);
+  folderDisplayHelper.load_via_src_path("fakeserver/maild.js", testHelperModule);
 }
 
 function installInto(module) {
   setupModule();
 
   // Now copy helper functions
   module.setupNNTPDaemon = setupNNTPDaemon;
   module.NNTP_PORT = NNTP_PORT;