From f4a6f9c4a64fe4bd8890bb396ce465c615c4b2f5 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Tue, 2 Oct 2018 07:45:54 +0000
Subject: [PATCH] Bug 1417383 - Move mochitests from docshell/test/ to
 docshell/test/mochitest/ to aid ESLint. r=qdot

Depends on D7052

Differential Revision: https://phabricator.services.mozilla.com/D7053
---
 docshell/moz.build                            |  2 +-
 .../{ => mochitest}/bug123696-subframe.html   |  0
 .../{ => mochitest}/bug404548-subframe.html   |  0
 .../bug404548-subframe_window.html            |  0
 .../test/{ => mochitest}/bug413310-post.sjs   |  0
 .../{ => mochitest}/bug413310-subframe.html   |  0
 .../{ => mochitest}/bug529119-window.html     |  0
 .../test/{ => mochitest}/bug530396-noref.sjs  |  0
 .../{ => mochitest}/bug530396-subframe.html   |  0
 .../bug570341_recordevents.html               |  0
 .../{ => mochitest}/bug668513_redirect.html   |  0
 .../bug668513_redirect.html^headers^          |  0
 .../test/{ => mochitest}/bug691547_frame.html |  0
 docshell/test/{ => mochitest}/dummy_page.html |  0
 ...ile_anchor_scroll_after_document_open.html |  0
 .../file_bfcache_plus_hash_1.html             |  0
 .../file_bfcache_plus_hash_2.html             |  0
 .../{ => mochitest}/file_bug1121701_1.html    |  0
 .../{ => mochitest}/file_bug1121701_2.html    |  0
 .../test/{ => mochitest}/file_bug1151421.html |  0
 .../test/{ => mochitest}/file_bug1186774.html |  0
 .../test/{ => mochitest}/file_bug1450164.html |  0
 .../{ => mochitest}/file_bug385434_1.html     |  0
 .../{ => mochitest}/file_bug385434_2.html     |  0
 .../{ => mochitest}/file_bug385434_3.html     |  0
 .../test/{ => mochitest}/file_bug475636.sjs   |  0
 .../test/{ => mochitest}/file_bug509055.html  |  0
 .../test/{ => mochitest}/file_bug511449.html  |  0
 .../test/{ => mochitest}/file_bug540462.html  |  0
 .../{ => mochitest}/file_bug580069_1.html     |  0
 .../test/{ => mochitest}/file_bug580069_2.sjs |  0
 .../{ => mochitest}/file_bug590573_1.html     |  0
 .../{ => mochitest}/file_bug590573_2.html     |  0
 .../{ => mochitest}/file_bug598895_1.html     |  0
 .../{ => mochitest}/file_bug598895_2.html     |  0
 .../test/{ => mochitest}/file_bug634834.html  |  0
 .../{ => mochitest}/file_bug637644_1.html     |  0
 .../{ => mochitest}/file_bug637644_2.html     |  0
 .../test/{ => mochitest}/file_bug640387.html  |  0
 .../test/{ => mochitest}/file_bug653741.html  |  0
 docshell/test/{ => mochitest}/file_bug660404  |  0
 .../{ => mochitest}/file_bug660404-1.html     |  0
 .../{ => mochitest}/file_bug660404^headers^   |  0
 .../test/{ => mochitest}/file_bug662170.html  |  0
 .../test/{ => mochitest}/file_bug668513.html  |  0
 .../test/{ => mochitest}/file_bug669671.sjs   |  0
 .../test/{ => mochitest}/file_bug675587.html  |  0
 .../test/{ => mochitest}/file_bug680257.html  |  0
 .../test/{ => mochitest}/file_bug703855.html  |  0
 .../test/{ => mochitest}/file_bug728939.html  |  0
 .../file_close_onpagehide1.html               |  0
 .../file_close_onpagehide2.html               |  0
 .../file_framedhistoryframes.html             |  0
 .../file_pushState_after_document_open.html   |  0
 .../test/{ => mochitest}/historyframes.html   |  2 +-
 docshell/test/{ => mochitest}/mochitest.ini   |  0
 .../{ => mochitest}/start_historyframe.html   |  0
 ...est_anchor_scroll_after_document_open.html |  0
 .../test_bfcache_plus_hash.html               |  0
 .../test/{ => mochitest}/test_bug1045096.html |  0
 .../test/{ => mochitest}/test_bug1121701.html |  0
 .../test/{ => mochitest}/test_bug1151421.html |  0
 .../test/{ => mochitest}/test_bug1186774.html |  0
 .../test/{ => mochitest}/test_bug123696.html  |  0
 .../test/{ => mochitest}/test_bug1450164.html |  0
 .../test/{ => mochitest}/test_bug384014.html  |  0
 .../test/{ => mochitest}/test_bug385434.html  |  0
 .../test/{ => mochitest}/test_bug387979.html  |  0
 .../test/{ => mochitest}/test_bug402210.html  |  0
 .../test/{ => mochitest}/test_bug404548.html  |  0
 .../test/{ => mochitest}/test_bug413310.html  |  0
 .../test/{ => mochitest}/test_bug475636.html  |  0
 .../test/{ => mochitest}/test_bug509055.html  |  0
 .../test/{ => mochitest}/test_bug511449.html  |  0
 .../{ => mochitest}/test_bug529119-1.html     | 20 ++---
 .../{ => mochitest}/test_bug529119-2.html     | 10 +--
 .../test/{ => mochitest}/test_bug530396.html  |  2 +-
 .../test/{ => mochitest}/test_bug540462.html  |  0
 .../test/{ => mochitest}/test_bug551225.html  |  0
 .../test/{ => mochitest}/test_bug570341.html  |  0
 .../test/{ => mochitest}/test_bug580069.html  |  0
 .../test/{ => mochitest}/test_bug590573.html  |  0
 .../test/{ => mochitest}/test_bug598895.html  |  0
 .../test/{ => mochitest}/test_bug634834.html  |  0
 .../test/{ => mochitest}/test_bug637644.html  |  0
 .../{ => mochitest}/test_bug640387_1.html     |  0
 .../{ => mochitest}/test_bug640387_2.html     |  0
 .../test/{ => mochitest}/test_bug653741.html  |  0
 .../test/{ => mochitest}/test_bug660404.html  |  0
 .../test/{ => mochitest}/test_bug662170.html  |  0
 .../test/{ => mochitest}/test_bug668513.html  |  0
 .../test/{ => mochitest}/test_bug669671.html  |  0
 .../test/{ => mochitest}/test_bug675587.html  |  0
 .../test/{ => mochitest}/test_bug680257.html  |  0
 .../test/{ => mochitest}/test_bug691547.html  |  0
 .../test/{ => mochitest}/test_bug694612.html  |  0
 .../test/{ => mochitest}/test_bug703855.html  |  0
 .../test/{ => mochitest}/test_bug728939.html  |  0
 .../test/{ => mochitest}/test_bug797909.html  |  0
 ...test_close_onpagehide_by_history_back.html |  0
 ...test_close_onpagehide_by_window_close.html |  0
 ..._forceinheritprincipal_overrule_owner.html |  0
 .../test_framedhistoryframes.html             |  0
 .../test_pushState_after_document_open.html   |  6 +-
 ...t_triggeringprincipal_location_seturi.html |  0
 .../test_windowedhistoryframes.html           |  0
 .../{ => mochitest}/url1_historyframe.html    |  0
 .../{ => mochitest}/url2_historyframe.html    |  0
 docshell/test/moz.build                       | 79 ++++++++++---------
 109 files changed, 62 insertions(+), 59 deletions(-)
 rename docshell/test/{ => mochitest}/bug123696-subframe.html (100%)
 rename docshell/test/{ => mochitest}/bug404548-subframe.html (100%)
 rename docshell/test/{ => mochitest}/bug404548-subframe_window.html (100%)
 rename docshell/test/{ => mochitest}/bug413310-post.sjs (100%)
 rename docshell/test/{ => mochitest}/bug413310-subframe.html (100%)
 rename docshell/test/{ => mochitest}/bug529119-window.html (100%)
 rename docshell/test/{ => mochitest}/bug530396-noref.sjs (100%)
 rename docshell/test/{ => mochitest}/bug530396-subframe.html (100%)
 rename docshell/test/{ => mochitest}/bug570341_recordevents.html (100%)
 rename docshell/test/{ => mochitest}/bug668513_redirect.html (100%)
 rename docshell/test/{ => mochitest}/bug668513_redirect.html^headers^ (100%)
 rename docshell/test/{ => mochitest}/bug691547_frame.html (100%)
 rename docshell/test/{ => mochitest}/dummy_page.html (100%)
 rename docshell/test/{ => mochitest}/file_anchor_scroll_after_document_open.html (100%)
 rename docshell/test/{ => mochitest}/file_bfcache_plus_hash_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bfcache_plus_hash_2.html (100%)
 rename docshell/test/{ => mochitest}/file_bug1121701_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug1121701_2.html (100%)
 rename docshell/test/{ => mochitest}/file_bug1151421.html (100%)
 rename docshell/test/{ => mochitest}/file_bug1186774.html (100%)
 rename docshell/test/{ => mochitest}/file_bug1450164.html (100%)
 rename docshell/test/{ => mochitest}/file_bug385434_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug385434_2.html (100%)
 rename docshell/test/{ => mochitest}/file_bug385434_3.html (100%)
 rename docshell/test/{ => mochitest}/file_bug475636.sjs (100%)
 rename docshell/test/{ => mochitest}/file_bug509055.html (100%)
 rename docshell/test/{ => mochitest}/file_bug511449.html (100%)
 rename docshell/test/{ => mochitest}/file_bug540462.html (100%)
 rename docshell/test/{ => mochitest}/file_bug580069_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug580069_2.sjs (100%)
 rename docshell/test/{ => mochitest}/file_bug590573_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug590573_2.html (100%)
 rename docshell/test/{ => mochitest}/file_bug598895_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug598895_2.html (100%)
 rename docshell/test/{ => mochitest}/file_bug634834.html (100%)
 rename docshell/test/{ => mochitest}/file_bug637644_1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug637644_2.html (100%)
 rename docshell/test/{ => mochitest}/file_bug640387.html (100%)
 rename docshell/test/{ => mochitest}/file_bug653741.html (100%)
 rename docshell/test/{ => mochitest}/file_bug660404 (100%)
 rename docshell/test/{ => mochitest}/file_bug660404-1.html (100%)
 rename docshell/test/{ => mochitest}/file_bug660404^headers^ (100%)
 rename docshell/test/{ => mochitest}/file_bug662170.html (100%)
 rename docshell/test/{ => mochitest}/file_bug668513.html (100%)
 rename docshell/test/{ => mochitest}/file_bug669671.sjs (100%)
 rename docshell/test/{ => mochitest}/file_bug675587.html (100%)
 rename docshell/test/{ => mochitest}/file_bug680257.html (100%)
 rename docshell/test/{ => mochitest}/file_bug703855.html (100%)
 rename docshell/test/{ => mochitest}/file_bug728939.html (100%)
 rename docshell/test/{ => mochitest}/file_close_onpagehide1.html (100%)
 rename docshell/test/{ => mochitest}/file_close_onpagehide2.html (100%)
 rename docshell/test/{ => mochitest}/file_framedhistoryframes.html (100%)
 rename docshell/test/{ => mochitest}/file_pushState_after_document_open.html (100%)
 rename docshell/test/{ => mochitest}/historyframes.html (98%)
 rename docshell/test/{ => mochitest}/mochitest.ini (100%)
 rename docshell/test/{ => mochitest}/start_historyframe.html (100%)
 rename docshell/test/{ => mochitest}/test_anchor_scroll_after_document_open.html (100%)
 rename docshell/test/{ => mochitest}/test_bfcache_plus_hash.html (100%)
 rename docshell/test/{ => mochitest}/test_bug1045096.html (100%)
 rename docshell/test/{ => mochitest}/test_bug1121701.html (100%)
 rename docshell/test/{ => mochitest}/test_bug1151421.html (100%)
 rename docshell/test/{ => mochitest}/test_bug1186774.html (100%)
 rename docshell/test/{ => mochitest}/test_bug123696.html (100%)
 rename docshell/test/{ => mochitest}/test_bug1450164.html (100%)
 rename docshell/test/{ => mochitest}/test_bug384014.html (100%)
 rename docshell/test/{ => mochitest}/test_bug385434.html (100%)
 rename docshell/test/{ => mochitest}/test_bug387979.html (100%)
 rename docshell/test/{ => mochitest}/test_bug402210.html (100%)
 rename docshell/test/{ => mochitest}/test_bug404548.html (100%)
 rename docshell/test/{ => mochitest}/test_bug413310.html (100%)
 rename docshell/test/{ => mochitest}/test_bug475636.html (100%)
 rename docshell/test/{ => mochitest}/test_bug509055.html (100%)
 rename docshell/test/{ => mochitest}/test_bug511449.html (100%)
 rename docshell/test/{ => mochitest}/test_bug529119-1.html (91%)
 rename docshell/test/{ => mochitest}/test_bug529119-2.html (95%)
 rename docshell/test/{ => mochitest}/test_bug530396.html (96%)
 rename docshell/test/{ => mochitest}/test_bug540462.html (100%)
 rename docshell/test/{ => mochitest}/test_bug551225.html (100%)
 rename docshell/test/{ => mochitest}/test_bug570341.html (100%)
 rename docshell/test/{ => mochitest}/test_bug580069.html (100%)
 rename docshell/test/{ => mochitest}/test_bug590573.html (100%)
 rename docshell/test/{ => mochitest}/test_bug598895.html (100%)
 rename docshell/test/{ => mochitest}/test_bug634834.html (100%)
 rename docshell/test/{ => mochitest}/test_bug637644.html (100%)
 rename docshell/test/{ => mochitest}/test_bug640387_1.html (100%)
 rename docshell/test/{ => mochitest}/test_bug640387_2.html (100%)
 rename docshell/test/{ => mochitest}/test_bug653741.html (100%)
 rename docshell/test/{ => mochitest}/test_bug660404.html (100%)
 rename docshell/test/{ => mochitest}/test_bug662170.html (100%)
 rename docshell/test/{ => mochitest}/test_bug668513.html (100%)
 rename docshell/test/{ => mochitest}/test_bug669671.html (100%)
 rename docshell/test/{ => mochitest}/test_bug675587.html (100%)
 rename docshell/test/{ => mochitest}/test_bug680257.html (100%)
 rename docshell/test/{ => mochitest}/test_bug691547.html (100%)
 rename docshell/test/{ => mochitest}/test_bug694612.html (100%)
 rename docshell/test/{ => mochitest}/test_bug703855.html (100%)
 rename docshell/test/{ => mochitest}/test_bug728939.html (100%)
 rename docshell/test/{ => mochitest}/test_bug797909.html (100%)
 rename docshell/test/{ => mochitest}/test_close_onpagehide_by_history_back.html (100%)
 rename docshell/test/{ => mochitest}/test_close_onpagehide_by_window_close.html (100%)
 rename docshell/test/{ => mochitest}/test_forceinheritprincipal_overrule_owner.html (100%)
 rename docshell/test/{ => mochitest}/test_framedhistoryframes.html (100%)
 rename docshell/test/{ => mochitest}/test_pushState_after_document_open.html (78%)
 rename docshell/test/{ => mochitest}/test_triggeringprincipal_location_seturi.html (100%)
 rename docshell/test/{ => mochitest}/test_windowedhistoryframes.html (100%)
 rename docshell/test/{ => mochitest}/url1_historyframe.html (100%)
 rename docshell/test/{ => mochitest}/url2_historyframe.html (100%)

diff --git a/docshell/moz.build b/docshell/moz.build
index b16067e53e139..982dffb95ae77 100644
--- a/docshell/moz.build
+++ b/docshell/moz.build
@@ -21,7 +21,7 @@ XPCSHELL_TESTS_MANIFESTS += [
 
 MOCHITEST_MANIFESTS += [
     'test/iframesandbox/mochitest.ini',
-    'test/mochitest.ini',
+    'test/mochitest/mochitest.ini',
     'test/navigation/mochitest.ini',
 ]
 
diff --git a/docshell/test/bug123696-subframe.html b/docshell/test/mochitest/bug123696-subframe.html
similarity index 100%
rename from docshell/test/bug123696-subframe.html
rename to docshell/test/mochitest/bug123696-subframe.html
diff --git a/docshell/test/bug404548-subframe.html b/docshell/test/mochitest/bug404548-subframe.html
similarity index 100%
rename from docshell/test/bug404548-subframe.html
rename to docshell/test/mochitest/bug404548-subframe.html
diff --git a/docshell/test/bug404548-subframe_window.html b/docshell/test/mochitest/bug404548-subframe_window.html
similarity index 100%
rename from docshell/test/bug404548-subframe_window.html
rename to docshell/test/mochitest/bug404548-subframe_window.html
diff --git a/docshell/test/bug413310-post.sjs b/docshell/test/mochitest/bug413310-post.sjs
similarity index 100%
rename from docshell/test/bug413310-post.sjs
rename to docshell/test/mochitest/bug413310-post.sjs
diff --git a/docshell/test/bug413310-subframe.html b/docshell/test/mochitest/bug413310-subframe.html
similarity index 100%
rename from docshell/test/bug413310-subframe.html
rename to docshell/test/mochitest/bug413310-subframe.html
diff --git a/docshell/test/bug529119-window.html b/docshell/test/mochitest/bug529119-window.html
similarity index 100%
rename from docshell/test/bug529119-window.html
rename to docshell/test/mochitest/bug529119-window.html
diff --git a/docshell/test/bug530396-noref.sjs b/docshell/test/mochitest/bug530396-noref.sjs
similarity index 100%
rename from docshell/test/bug530396-noref.sjs
rename to docshell/test/mochitest/bug530396-noref.sjs
diff --git a/docshell/test/bug530396-subframe.html b/docshell/test/mochitest/bug530396-subframe.html
similarity index 100%
rename from docshell/test/bug530396-subframe.html
rename to docshell/test/mochitest/bug530396-subframe.html
diff --git a/docshell/test/bug570341_recordevents.html b/docshell/test/mochitest/bug570341_recordevents.html
similarity index 100%
rename from docshell/test/bug570341_recordevents.html
rename to docshell/test/mochitest/bug570341_recordevents.html
diff --git a/docshell/test/bug668513_redirect.html b/docshell/test/mochitest/bug668513_redirect.html
similarity index 100%
rename from docshell/test/bug668513_redirect.html
rename to docshell/test/mochitest/bug668513_redirect.html
diff --git a/docshell/test/bug668513_redirect.html^headers^ b/docshell/test/mochitest/bug668513_redirect.html^headers^
similarity index 100%
rename from docshell/test/bug668513_redirect.html^headers^
rename to docshell/test/mochitest/bug668513_redirect.html^headers^
diff --git a/docshell/test/bug691547_frame.html b/docshell/test/mochitest/bug691547_frame.html
similarity index 100%
rename from docshell/test/bug691547_frame.html
rename to docshell/test/mochitest/bug691547_frame.html
diff --git a/docshell/test/dummy_page.html b/docshell/test/mochitest/dummy_page.html
similarity index 100%
rename from docshell/test/dummy_page.html
rename to docshell/test/mochitest/dummy_page.html
diff --git a/docshell/test/file_anchor_scroll_after_document_open.html b/docshell/test/mochitest/file_anchor_scroll_after_document_open.html
similarity index 100%
rename from docshell/test/file_anchor_scroll_after_document_open.html
rename to docshell/test/mochitest/file_anchor_scroll_after_document_open.html
diff --git a/docshell/test/file_bfcache_plus_hash_1.html b/docshell/test/mochitest/file_bfcache_plus_hash_1.html
similarity index 100%
rename from docshell/test/file_bfcache_plus_hash_1.html
rename to docshell/test/mochitest/file_bfcache_plus_hash_1.html
diff --git a/docshell/test/file_bfcache_plus_hash_2.html b/docshell/test/mochitest/file_bfcache_plus_hash_2.html
similarity index 100%
rename from docshell/test/file_bfcache_plus_hash_2.html
rename to docshell/test/mochitest/file_bfcache_plus_hash_2.html
diff --git a/docshell/test/file_bug1121701_1.html b/docshell/test/mochitest/file_bug1121701_1.html
similarity index 100%
rename from docshell/test/file_bug1121701_1.html
rename to docshell/test/mochitest/file_bug1121701_1.html
diff --git a/docshell/test/file_bug1121701_2.html b/docshell/test/mochitest/file_bug1121701_2.html
similarity index 100%
rename from docshell/test/file_bug1121701_2.html
rename to docshell/test/mochitest/file_bug1121701_2.html
diff --git a/docshell/test/file_bug1151421.html b/docshell/test/mochitest/file_bug1151421.html
similarity index 100%
rename from docshell/test/file_bug1151421.html
rename to docshell/test/mochitest/file_bug1151421.html
diff --git a/docshell/test/file_bug1186774.html b/docshell/test/mochitest/file_bug1186774.html
similarity index 100%
rename from docshell/test/file_bug1186774.html
rename to docshell/test/mochitest/file_bug1186774.html
diff --git a/docshell/test/file_bug1450164.html b/docshell/test/mochitest/file_bug1450164.html
similarity index 100%
rename from docshell/test/file_bug1450164.html
rename to docshell/test/mochitest/file_bug1450164.html
diff --git a/docshell/test/file_bug385434_1.html b/docshell/test/mochitest/file_bug385434_1.html
similarity index 100%
rename from docshell/test/file_bug385434_1.html
rename to docshell/test/mochitest/file_bug385434_1.html
diff --git a/docshell/test/file_bug385434_2.html b/docshell/test/mochitest/file_bug385434_2.html
similarity index 100%
rename from docshell/test/file_bug385434_2.html
rename to docshell/test/mochitest/file_bug385434_2.html
diff --git a/docshell/test/file_bug385434_3.html b/docshell/test/mochitest/file_bug385434_3.html
similarity index 100%
rename from docshell/test/file_bug385434_3.html
rename to docshell/test/mochitest/file_bug385434_3.html
diff --git a/docshell/test/file_bug475636.sjs b/docshell/test/mochitest/file_bug475636.sjs
similarity index 100%
rename from docshell/test/file_bug475636.sjs
rename to docshell/test/mochitest/file_bug475636.sjs
diff --git a/docshell/test/file_bug509055.html b/docshell/test/mochitest/file_bug509055.html
similarity index 100%
rename from docshell/test/file_bug509055.html
rename to docshell/test/mochitest/file_bug509055.html
diff --git a/docshell/test/file_bug511449.html b/docshell/test/mochitest/file_bug511449.html
similarity index 100%
rename from docshell/test/file_bug511449.html
rename to docshell/test/mochitest/file_bug511449.html
diff --git a/docshell/test/file_bug540462.html b/docshell/test/mochitest/file_bug540462.html
similarity index 100%
rename from docshell/test/file_bug540462.html
rename to docshell/test/mochitest/file_bug540462.html
diff --git a/docshell/test/file_bug580069_1.html b/docshell/test/mochitest/file_bug580069_1.html
similarity index 100%
rename from docshell/test/file_bug580069_1.html
rename to docshell/test/mochitest/file_bug580069_1.html
diff --git a/docshell/test/file_bug580069_2.sjs b/docshell/test/mochitest/file_bug580069_2.sjs
similarity index 100%
rename from docshell/test/file_bug580069_2.sjs
rename to docshell/test/mochitest/file_bug580069_2.sjs
diff --git a/docshell/test/file_bug590573_1.html b/docshell/test/mochitest/file_bug590573_1.html
similarity index 100%
rename from docshell/test/file_bug590573_1.html
rename to docshell/test/mochitest/file_bug590573_1.html
diff --git a/docshell/test/file_bug590573_2.html b/docshell/test/mochitest/file_bug590573_2.html
similarity index 100%
rename from docshell/test/file_bug590573_2.html
rename to docshell/test/mochitest/file_bug590573_2.html
diff --git a/docshell/test/file_bug598895_1.html b/docshell/test/mochitest/file_bug598895_1.html
similarity index 100%
rename from docshell/test/file_bug598895_1.html
rename to docshell/test/mochitest/file_bug598895_1.html
diff --git a/docshell/test/file_bug598895_2.html b/docshell/test/mochitest/file_bug598895_2.html
similarity index 100%
rename from docshell/test/file_bug598895_2.html
rename to docshell/test/mochitest/file_bug598895_2.html
diff --git a/docshell/test/file_bug634834.html b/docshell/test/mochitest/file_bug634834.html
similarity index 100%
rename from docshell/test/file_bug634834.html
rename to docshell/test/mochitest/file_bug634834.html
diff --git a/docshell/test/file_bug637644_1.html b/docshell/test/mochitest/file_bug637644_1.html
similarity index 100%
rename from docshell/test/file_bug637644_1.html
rename to docshell/test/mochitest/file_bug637644_1.html
diff --git a/docshell/test/file_bug637644_2.html b/docshell/test/mochitest/file_bug637644_2.html
similarity index 100%
rename from docshell/test/file_bug637644_2.html
rename to docshell/test/mochitest/file_bug637644_2.html
diff --git a/docshell/test/file_bug640387.html b/docshell/test/mochitest/file_bug640387.html
similarity index 100%
rename from docshell/test/file_bug640387.html
rename to docshell/test/mochitest/file_bug640387.html
diff --git a/docshell/test/file_bug653741.html b/docshell/test/mochitest/file_bug653741.html
similarity index 100%
rename from docshell/test/file_bug653741.html
rename to docshell/test/mochitest/file_bug653741.html
diff --git a/docshell/test/file_bug660404 b/docshell/test/mochitest/file_bug660404
similarity index 100%
rename from docshell/test/file_bug660404
rename to docshell/test/mochitest/file_bug660404
diff --git a/docshell/test/file_bug660404-1.html b/docshell/test/mochitest/file_bug660404-1.html
similarity index 100%
rename from docshell/test/file_bug660404-1.html
rename to docshell/test/mochitest/file_bug660404-1.html
diff --git a/docshell/test/file_bug660404^headers^ b/docshell/test/mochitest/file_bug660404^headers^
similarity index 100%
rename from docshell/test/file_bug660404^headers^
rename to docshell/test/mochitest/file_bug660404^headers^
diff --git a/docshell/test/file_bug662170.html b/docshell/test/mochitest/file_bug662170.html
similarity index 100%
rename from docshell/test/file_bug662170.html
rename to docshell/test/mochitest/file_bug662170.html
diff --git a/docshell/test/file_bug668513.html b/docshell/test/mochitest/file_bug668513.html
similarity index 100%
rename from docshell/test/file_bug668513.html
rename to docshell/test/mochitest/file_bug668513.html
diff --git a/docshell/test/file_bug669671.sjs b/docshell/test/mochitest/file_bug669671.sjs
similarity index 100%
rename from docshell/test/file_bug669671.sjs
rename to docshell/test/mochitest/file_bug669671.sjs
diff --git a/docshell/test/file_bug675587.html b/docshell/test/mochitest/file_bug675587.html
similarity index 100%
rename from docshell/test/file_bug675587.html
rename to docshell/test/mochitest/file_bug675587.html
diff --git a/docshell/test/file_bug680257.html b/docshell/test/mochitest/file_bug680257.html
similarity index 100%
rename from docshell/test/file_bug680257.html
rename to docshell/test/mochitest/file_bug680257.html
diff --git a/docshell/test/file_bug703855.html b/docshell/test/mochitest/file_bug703855.html
similarity index 100%
rename from docshell/test/file_bug703855.html
rename to docshell/test/mochitest/file_bug703855.html
diff --git a/docshell/test/file_bug728939.html b/docshell/test/mochitest/file_bug728939.html
similarity index 100%
rename from docshell/test/file_bug728939.html
rename to docshell/test/mochitest/file_bug728939.html
diff --git a/docshell/test/file_close_onpagehide1.html b/docshell/test/mochitest/file_close_onpagehide1.html
similarity index 100%
rename from docshell/test/file_close_onpagehide1.html
rename to docshell/test/mochitest/file_close_onpagehide1.html
diff --git a/docshell/test/file_close_onpagehide2.html b/docshell/test/mochitest/file_close_onpagehide2.html
similarity index 100%
rename from docshell/test/file_close_onpagehide2.html
rename to docshell/test/mochitest/file_close_onpagehide2.html
diff --git a/docshell/test/file_framedhistoryframes.html b/docshell/test/mochitest/file_framedhistoryframes.html
similarity index 100%
rename from docshell/test/file_framedhistoryframes.html
rename to docshell/test/mochitest/file_framedhistoryframes.html
diff --git a/docshell/test/file_pushState_after_document_open.html b/docshell/test/mochitest/file_pushState_after_document_open.html
similarity index 100%
rename from docshell/test/file_pushState_after_document_open.html
rename to docshell/test/mochitest/file_pushState_after_document_open.html
diff --git a/docshell/test/historyframes.html b/docshell/test/mochitest/historyframes.html
similarity index 98%
rename from docshell/test/historyframes.html
rename to docshell/test/mochitest/historyframes.html
index 7b364ff2a6e14..8472215ffe016 100644
--- a/docshell/test/historyframes.html
+++ b/docshell/test/mochitest/historyframes.html
@@ -50,7 +50,7 @@
   return gFrame.contentDocument.getElementById("text").textContent;
 }
 
-var BASE_URI = "http://mochi.test:8888/tests/docshell/test/";
+var BASE_URI = "http://mochi.test:8888/tests/docshell/test/mochitest/";
 var START = BASE_URI + "start_historyframe.html";
 var URL1 = BASE_URI + "url1_historyframe.html";
 var URL2 = BASE_URI + "url2_historyframe.html";
diff --git a/docshell/test/mochitest.ini b/docshell/test/mochitest/mochitest.ini
similarity index 100%
rename from docshell/test/mochitest.ini
rename to docshell/test/mochitest/mochitest.ini
diff --git a/docshell/test/start_historyframe.html b/docshell/test/mochitest/start_historyframe.html
similarity index 100%
rename from docshell/test/start_historyframe.html
rename to docshell/test/mochitest/start_historyframe.html
diff --git a/docshell/test/test_anchor_scroll_after_document_open.html b/docshell/test/mochitest/test_anchor_scroll_after_document_open.html
similarity index 100%
rename from docshell/test/test_anchor_scroll_after_document_open.html
rename to docshell/test/mochitest/test_anchor_scroll_after_document_open.html
diff --git a/docshell/test/test_bfcache_plus_hash.html b/docshell/test/mochitest/test_bfcache_plus_hash.html
similarity index 100%
rename from docshell/test/test_bfcache_plus_hash.html
rename to docshell/test/mochitest/test_bfcache_plus_hash.html
diff --git a/docshell/test/test_bug1045096.html b/docshell/test/mochitest/test_bug1045096.html
similarity index 100%
rename from docshell/test/test_bug1045096.html
rename to docshell/test/mochitest/test_bug1045096.html
diff --git a/docshell/test/test_bug1121701.html b/docshell/test/mochitest/test_bug1121701.html
similarity index 100%
rename from docshell/test/test_bug1121701.html
rename to docshell/test/mochitest/test_bug1121701.html
diff --git a/docshell/test/test_bug1151421.html b/docshell/test/mochitest/test_bug1151421.html
similarity index 100%
rename from docshell/test/test_bug1151421.html
rename to docshell/test/mochitest/test_bug1151421.html
diff --git a/docshell/test/test_bug1186774.html b/docshell/test/mochitest/test_bug1186774.html
similarity index 100%
rename from docshell/test/test_bug1186774.html
rename to docshell/test/mochitest/test_bug1186774.html
diff --git a/docshell/test/test_bug123696.html b/docshell/test/mochitest/test_bug123696.html
similarity index 100%
rename from docshell/test/test_bug123696.html
rename to docshell/test/mochitest/test_bug123696.html
diff --git a/docshell/test/test_bug1450164.html b/docshell/test/mochitest/test_bug1450164.html
similarity index 100%
rename from docshell/test/test_bug1450164.html
rename to docshell/test/mochitest/test_bug1450164.html
diff --git a/docshell/test/test_bug384014.html b/docshell/test/mochitest/test_bug384014.html
similarity index 100%
rename from docshell/test/test_bug384014.html
rename to docshell/test/mochitest/test_bug384014.html
diff --git a/docshell/test/test_bug385434.html b/docshell/test/mochitest/test_bug385434.html
similarity index 100%
rename from docshell/test/test_bug385434.html
rename to docshell/test/mochitest/test_bug385434.html
diff --git a/docshell/test/test_bug387979.html b/docshell/test/mochitest/test_bug387979.html
similarity index 100%
rename from docshell/test/test_bug387979.html
rename to docshell/test/mochitest/test_bug387979.html
diff --git a/docshell/test/test_bug402210.html b/docshell/test/mochitest/test_bug402210.html
similarity index 100%
rename from docshell/test/test_bug402210.html
rename to docshell/test/mochitest/test_bug402210.html
diff --git a/docshell/test/test_bug404548.html b/docshell/test/mochitest/test_bug404548.html
similarity index 100%
rename from docshell/test/test_bug404548.html
rename to docshell/test/mochitest/test_bug404548.html
diff --git a/docshell/test/test_bug413310.html b/docshell/test/mochitest/test_bug413310.html
similarity index 100%
rename from docshell/test/test_bug413310.html
rename to docshell/test/mochitest/test_bug413310.html
diff --git a/docshell/test/test_bug475636.html b/docshell/test/mochitest/test_bug475636.html
similarity index 100%
rename from docshell/test/test_bug475636.html
rename to docshell/test/mochitest/test_bug475636.html
diff --git a/docshell/test/test_bug509055.html b/docshell/test/mochitest/test_bug509055.html
similarity index 100%
rename from docshell/test/test_bug509055.html
rename to docshell/test/mochitest/test_bug509055.html
diff --git a/docshell/test/test_bug511449.html b/docshell/test/mochitest/test_bug511449.html
similarity index 100%
rename from docshell/test/test_bug511449.html
rename to docshell/test/mochitest/test_bug511449.html
diff --git a/docshell/test/test_bug529119-1.html b/docshell/test/mochitest/test_bug529119-1.html
similarity index 91%
rename from docshell/test/test_bug529119-1.html
rename to docshell/test/mochitest/test_bug529119-1.html
index 573885dc0f01a..a2da9a7cc107c 100644
--- a/docshell/test/test_bug529119-1.html
+++ b/docshell/test/mochitest/test_bug529119-1.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Test bug 529119</title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <script class="testbody" type="text/javascript">
@@ -10,7 +10,7 @@
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
+var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
 var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
 
 var w = null;
@@ -33,7 +33,7 @@
       catch (ex) {
         haveErrorPage = true;
       }
-  
+
       if (iterationsLeft == 0 || haveErrorPage) {
         window.clearInterval(int);
         f(iterationsLeft > 0);
@@ -51,35 +51,35 @@
       window.setTimeout(function() {
         w.location.href = faultyURL;
       }, 0);
-    
+
       phase = 1;
 
       pollForPage(function(succeeded) {
         ok(succeeded, "Waiting for error page succeeded");
-        
-        /* 3. now, while we are on the error page, try to reload it, actually 
+
+        /* 3. now, while we are on the error page, try to reload it, actually
            click the "Try Again" button */
         SpecialPowers.wrap(w).location.reload();
 
         pollForPage(function(succeeded) {
           ok(succeeded, "Waiting for error page succeeded");
-          
+
           /* 4-finish, check we are still on the error page */
           is(SpecialPowers.wrap(w).location.href, faultyURL, "Is on an error page");
           isnot(SpecialPowers.wrap(w).location.href, workingURL, "Is not on the previous page");
-          is(gotWrongPageOnTryAgainClick, false, 
+          is(gotWrongPageOnTryAgainClick, false,
             "Must not get www.example.com page on reload of an error page");
           w.close();
           SimpleTest.finish();
         }, w);
       }, w);
       break;
-      
+
     case 1:
       /* 4-check, we must not get here! */
       gotWrongPageOnTryAgainClick = true;
       break;
-  }             
+  }
 }
 
 function startTest()
diff --git a/docshell/test/test_bug529119-2.html b/docshell/test/mochitest/test_bug529119-2.html
similarity index 95%
rename from docshell/test/test_bug529119-2.html
rename to docshell/test/mochitest/test_bug529119-2.html
index 41b867141c274..b71d3b3057a96 100644
--- a/docshell/test/test_bug529119-2.html
+++ b/docshell/test/mochitest/test_bug529119-2.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 <title>Test bug 529119</title>
-<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
+<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 
 <script class="testbody" type="text/javascript">
@@ -10,7 +10,7 @@
 SimpleTest.waitForExplicitFinish();
 SimpleTest.requestFlakyTimeout("untriaged");
 
-var workingURL = "http://mochi.test:8888/tests/docshell/test/bug529119-window.html";
+var workingURL = "http://mochi.test:8888/tests/docshell/test/mochitest/bug529119-window.html";
 var faultyURL = "http://some-nonexistent-domain-27489274c892748217cn2384.com/";
 
 var w = null;
@@ -25,7 +25,7 @@
     var iterationsLeft = 200;
     var int = window.setInterval(function() {
       iterationsLeft--;
-      
+
       var haveErrorPage = false;
       try {
         var title = w.document.title;
@@ -33,7 +33,7 @@
       catch (ex) {
         haveErrorPage = true;
       }
-  
+
       if (iterationsLeft == 0 || expectErrorPage == haveErrorPage) {
         window.clearInterval(int);
         f(iterationsLeft > 0);
@@ -51,7 +51,7 @@
   isWindowLoaded = true;
 
   /* 2. We have successfully loaded a page, now go to a faulty URL */
-  // XXX The test fails when we change the location synchronously 
+  // XXX The test fails when we change the location synchronously
   window.setTimeout(function() {
     w.location.href = faultyURL;
   }, 0);
diff --git a/docshell/test/test_bug530396.html b/docshell/test/mochitest/test_bug530396.html
similarity index 96%
rename from docshell/test/test_bug530396.html
rename to docshell/test/mochitest/test_bug530396.html
index 7ed8970815909..7262af0529b34 100644
--- a/docshell/test/test_bug530396.html
+++ b/docshell/test/mochitest/test_bug530396.html
@@ -14,7 +14,7 @@
 
 <p>
 
-<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/bug530396-subframe.html"></iframe>
+<iframe id="testFrame" src="http://mochi.test:8888/tests/docshell/test/mochitest/bug530396-subframe.html"></iframe>
 
 <pre id="test">
 <script class="testbody" type="text/javascript">
diff --git a/docshell/test/test_bug540462.html b/docshell/test/mochitest/test_bug540462.html
similarity index 100%
rename from docshell/test/test_bug540462.html
rename to docshell/test/mochitest/test_bug540462.html
diff --git a/docshell/test/test_bug551225.html b/docshell/test/mochitest/test_bug551225.html
similarity index 100%
rename from docshell/test/test_bug551225.html
rename to docshell/test/mochitest/test_bug551225.html
diff --git a/docshell/test/test_bug570341.html b/docshell/test/mochitest/test_bug570341.html
similarity index 100%
rename from docshell/test/test_bug570341.html
rename to docshell/test/mochitest/test_bug570341.html
diff --git a/docshell/test/test_bug580069.html b/docshell/test/mochitest/test_bug580069.html
similarity index 100%
rename from docshell/test/test_bug580069.html
rename to docshell/test/mochitest/test_bug580069.html
diff --git a/docshell/test/test_bug590573.html b/docshell/test/mochitest/test_bug590573.html
similarity index 100%
rename from docshell/test/test_bug590573.html
rename to docshell/test/mochitest/test_bug590573.html
diff --git a/docshell/test/test_bug598895.html b/docshell/test/mochitest/test_bug598895.html
similarity index 100%
rename from docshell/test/test_bug598895.html
rename to docshell/test/mochitest/test_bug598895.html
diff --git a/docshell/test/test_bug634834.html b/docshell/test/mochitest/test_bug634834.html
similarity index 100%
rename from docshell/test/test_bug634834.html
rename to docshell/test/mochitest/test_bug634834.html
diff --git a/docshell/test/test_bug637644.html b/docshell/test/mochitest/test_bug637644.html
similarity index 100%
rename from docshell/test/test_bug637644.html
rename to docshell/test/mochitest/test_bug637644.html
diff --git a/docshell/test/test_bug640387_1.html b/docshell/test/mochitest/test_bug640387_1.html
similarity index 100%
rename from docshell/test/test_bug640387_1.html
rename to docshell/test/mochitest/test_bug640387_1.html
diff --git a/docshell/test/test_bug640387_2.html b/docshell/test/mochitest/test_bug640387_2.html
similarity index 100%
rename from docshell/test/test_bug640387_2.html
rename to docshell/test/mochitest/test_bug640387_2.html
diff --git a/docshell/test/test_bug653741.html b/docshell/test/mochitest/test_bug653741.html
similarity index 100%
rename from docshell/test/test_bug653741.html
rename to docshell/test/mochitest/test_bug653741.html
diff --git a/docshell/test/test_bug660404.html b/docshell/test/mochitest/test_bug660404.html
similarity index 100%
rename from docshell/test/test_bug660404.html
rename to docshell/test/mochitest/test_bug660404.html
diff --git a/docshell/test/test_bug662170.html b/docshell/test/mochitest/test_bug662170.html
similarity index 100%
rename from docshell/test/test_bug662170.html
rename to docshell/test/mochitest/test_bug662170.html
diff --git a/docshell/test/test_bug668513.html b/docshell/test/mochitest/test_bug668513.html
similarity index 100%
rename from docshell/test/test_bug668513.html
rename to docshell/test/mochitest/test_bug668513.html
diff --git a/docshell/test/test_bug669671.html b/docshell/test/mochitest/test_bug669671.html
similarity index 100%
rename from docshell/test/test_bug669671.html
rename to docshell/test/mochitest/test_bug669671.html
diff --git a/docshell/test/test_bug675587.html b/docshell/test/mochitest/test_bug675587.html
similarity index 100%
rename from docshell/test/test_bug675587.html
rename to docshell/test/mochitest/test_bug675587.html
diff --git a/docshell/test/test_bug680257.html b/docshell/test/mochitest/test_bug680257.html
similarity index 100%
rename from docshell/test/test_bug680257.html
rename to docshell/test/mochitest/test_bug680257.html
diff --git a/docshell/test/test_bug691547.html b/docshell/test/mochitest/test_bug691547.html
similarity index 100%
rename from docshell/test/test_bug691547.html
rename to docshell/test/mochitest/test_bug691547.html
diff --git a/docshell/test/test_bug694612.html b/docshell/test/mochitest/test_bug694612.html
similarity index 100%
rename from docshell/test/test_bug694612.html
rename to docshell/test/mochitest/test_bug694612.html
diff --git a/docshell/test/test_bug703855.html b/docshell/test/mochitest/test_bug703855.html
similarity index 100%
rename from docshell/test/test_bug703855.html
rename to docshell/test/mochitest/test_bug703855.html
diff --git a/docshell/test/test_bug728939.html b/docshell/test/mochitest/test_bug728939.html
similarity index 100%
rename from docshell/test/test_bug728939.html
rename to docshell/test/mochitest/test_bug728939.html
diff --git a/docshell/test/test_bug797909.html b/docshell/test/mochitest/test_bug797909.html
similarity index 100%
rename from docshell/test/test_bug797909.html
rename to docshell/test/mochitest/test_bug797909.html
diff --git a/docshell/test/test_close_onpagehide_by_history_back.html b/docshell/test/mochitest/test_close_onpagehide_by_history_back.html
similarity index 100%
rename from docshell/test/test_close_onpagehide_by_history_back.html
rename to docshell/test/mochitest/test_close_onpagehide_by_history_back.html
diff --git a/docshell/test/test_close_onpagehide_by_window_close.html b/docshell/test/mochitest/test_close_onpagehide_by_window_close.html
similarity index 100%
rename from docshell/test/test_close_onpagehide_by_window_close.html
rename to docshell/test/mochitest/test_close_onpagehide_by_window_close.html
diff --git a/docshell/test/test_forceinheritprincipal_overrule_owner.html b/docshell/test/mochitest/test_forceinheritprincipal_overrule_owner.html
similarity index 100%
rename from docshell/test/test_forceinheritprincipal_overrule_owner.html
rename to docshell/test/mochitest/test_forceinheritprincipal_overrule_owner.html
diff --git a/docshell/test/test_framedhistoryframes.html b/docshell/test/mochitest/test_framedhistoryframes.html
similarity index 100%
rename from docshell/test/test_framedhistoryframes.html
rename to docshell/test/mochitest/test_framedhistoryframes.html
diff --git a/docshell/test/test_pushState_after_document_open.html b/docshell/test/mochitest/test_pushState_after_document_open.html
similarity index 78%
rename from docshell/test/test_pushState_after_document_open.html
rename to docshell/test/mochitest/test_pushState_after_document_open.html
index 51ba1050c2199..e52df96e16939 100644
--- a/docshell/test/test_pushState_after_document_open.html
+++ b/docshell/test/mochitest/test_pushState_after_document_open.html
@@ -15,10 +15,12 @@
   // Child needs to invoke us, otherwise our onload will fire before the child
   // has done the write/close bit.
   onmessage = function doTest() {
-    is(frames[0].location.pathname, "/tests/docshell/test/file_pushState_after_document_open.html", "Should have the right path here");
+    is(frames[0].location.pathname, "/tests/docshell/test/mochitest/file_pushState_after_document_open.html",
+       "Should have the right path here");
     is(frames[0].location.hash, "", "Should have the right hash here");
     frames[0].history.pushState({}, '', frames[0].document.URL + "#foopy");
-    is(frames[0].location.pathname, "/tests/docshell/test/file_pushState_after_document_open.html", "Pathname should not have changed");
+    is(frames[0].location.pathname, "/tests/docshell/test/mochitest/file_pushState_after_document_open.html",
+       "Pathname should not have changed");
     is(frames[0].location.hash, "#foopy", "Hash should have changed");
     SimpleTest.finish();
   }
diff --git a/docshell/test/test_triggeringprincipal_location_seturi.html b/docshell/test/mochitest/test_triggeringprincipal_location_seturi.html
similarity index 100%
rename from docshell/test/test_triggeringprincipal_location_seturi.html
rename to docshell/test/mochitest/test_triggeringprincipal_location_seturi.html
diff --git a/docshell/test/test_windowedhistoryframes.html b/docshell/test/mochitest/test_windowedhistoryframes.html
similarity index 100%
rename from docshell/test/test_windowedhistoryframes.html
rename to docshell/test/mochitest/test_windowedhistoryframes.html
diff --git a/docshell/test/url1_historyframe.html b/docshell/test/mochitest/url1_historyframe.html
similarity index 100%
rename from docshell/test/url1_historyframe.html
rename to docshell/test/mochitest/url1_historyframe.html
diff --git a/docshell/test/url2_historyframe.html b/docshell/test/mochitest/url2_historyframe.html
similarity index 100%
rename from docshell/test/url2_historyframe.html
rename to docshell/test/mochitest/url2_historyframe.html
diff --git a/docshell/test/moz.build b/docshell/test/moz.build
index aea811e228e42..c50dae42d7694 100644
--- a/docshell/test/moz.build
+++ b/docshell/test/moz.build
@@ -69,6 +69,46 @@ with Files('iframesandbox/*marquee_event_handlers*'):
     BUG_COMPONENT = ('Core', 'DOM: Security')
 
 
+with Files('mochitest/*1045096*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*1151421*'):
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+
+with Files('mochitest/*402210*'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+with Files('mochitest/*509055*'):
+    BUG_COMPONENT = ('Core', 'History: Global')
+
+with Files('mochitest/*511449*'):
+    BUG_COMPONENT = ('Core', 'Widget: Cocoa')
+
+with Files('mochitest/*551225*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*570341*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*580069*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*637644*'):
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+
+with Files('mochitest/*640387*'):
+    BUG_COMPONENT = ('Core', 'DOM: Events')
+
+with Files('mochitest/*668513*'):
+    BUG_COMPONENT = ('Core', 'DOM')
+
+with Files('mochitest/*797909*'):
+    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
+
+with Files('mochitest/*forceinheritprincipal*'):
+    BUG_COMPONENT = ('Core', 'DOM: Security')
+
+
 with Files('navigation/*13871.html'):
     BUG_COMPONENT = ('Core', 'Security')
 
@@ -99,42 +139,3 @@ with Files('unit/*442584*'):
 
 with Files('unit/*setUsePrivateBrowsing*'):
     BUG_COMPONENT = ('Firefox', 'Extension Compatibility')
-
-with Files('*1045096*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*1151421*'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
-
-with Files('*402210*'):
-    BUG_COMPONENT = ('Core', 'DOM: Security')
-
-with Files('*509055*'):
-    BUG_COMPONENT = ('Core', 'History: Global')
-
-with Files('*511449*'):
-    BUG_COMPONENT = ('Core', 'Widget: Cocoa')
-
-with Files('*551225*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*570341*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*580069*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*637644*'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
-
-with Files('*640387*'):
-    BUG_COMPONENT = ('Core', 'DOM: Events')
-
-with Files('*668513*'):
-    BUG_COMPONENT = ('Core', 'DOM')
-
-with Files('*797909*'):
-    BUG_COMPONENT = ('Core', 'DOM: Core & HTML')
-
-with Files('*forceinheritprincipal*'):
-    BUG_COMPONENT = ('Core', 'DOM: Security')