diff --git a/browser/base/content/test/favicons/browser.ini b/browser/base/content/test/favicons/browser.ini
index 3829d7d598e6..5c45d4fb5bf9 100644
--- a/browser/base/content/test/favicons/browser.ini
+++ b/browser/base/content/test/favicons/browser.ini
@@ -7,8 +7,13 @@ support-files =
moz.png
rich_moz_1.png
rich_moz_2.png
+ file_favicon.html
+ file_favicon.png
+ file_favicon.png^headers^
+ file_favicon_thirdParty.html
[browser_multiple_icons_in_short_timeframe.js]
[browser_rich_icons.js]
[browser_icon_discovery.js]
[browser_preferred_icons.js]
+[browser_favicon_load.js]
diff --git a/browser/base/content/test/performance/browser_favicon_load.js b/browser/base/content/test/favicons/browser_favicon_load.js
similarity index 89%
rename from browser/base/content/test/performance/browser_favicon_load.js
rename to browser/base/content/test/favicons/browser_favicon_load.js
index 9feb0d8ed1c7..13635eb3c0b7 100644
--- a/browser/base/content/test/performance/browser_favicon_load.js
+++ b/browser/base/content/test/favicons/browser_favicon_load.js
@@ -9,17 +9,19 @@ const { classes: Cc, Constructor: CC, interfaces: Ci, utils: Cu } = Components;
const TEST_SITE = "http://example.net";
const TEST_THIRD_PARTY_SITE = "http://mochi.test:8888";
-const TEST_PAGE = TEST_SITE + "/browser/browser/components/originattributes/" +
- "test/browser/file_favicon.html";
-const FAVICON_URI = TEST_SITE + "/browser/browser/components/originattributes/" +
- "test/browser/file_favicon.png";
-const TEST_THIRD_PARTY_PAGE = "http://example.com/browser/browser/components/" +
- "originattributes/test/browser/file_favicon_thirdParty.html";
-const THIRD_PARTY_FAVICON_URI = TEST_THIRD_PARTY_SITE + "/browser/browser/components/" +
- "originattributes/test/browser/file_favicon.png";
+const TEST_PAGE =
+ TEST_SITE + "/browser/browser/base/content/test/favicons/file_favicon.html";
+const FAVICON_URI =
+ TEST_SITE + "/browser/browser/base/content/test/favicons/file_favicon.png";
+const TEST_THIRD_PARTY_PAGE =
+ TEST_SITE + "/browser/browser/base/content/test/favicons/file_favicon_thirdParty.html";
+const THIRD_PARTY_FAVICON_URI =
+ TEST_THIRD_PARTY_SITE + "/browser/browser/base/content/test/favicons/file_favicon.png";
XPCOMUtils.defineLazyModuleGetter(this, "PromiseUtils",
"resource://gre/modules/PromiseUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PlacesTestUtils",
+ "resource://testing-common/PlacesTestUtils.jsm");
let systemPrincipal = Services.scriptSecurityManager.getSystemPrincipal();
diff --git a/browser/base/content/test/favicons/file_favicon.html b/browser/base/content/test/favicons/file_favicon.html
new file mode 100644
index 000000000000..f294b4775865
--- /dev/null
+++ b/browser/base/content/test/favicons/file_favicon.html
@@ -0,0 +1,11 @@
+
+
+
+
+ Favicon Test for originAttributes
+
+
+
+ Favicon!!
+
+
diff --git a/browser/base/content/test/favicons/file_favicon.png b/browser/base/content/test/favicons/file_favicon.png
new file mode 100644
index 000000000000..5535363c94df
Binary files /dev/null and b/browser/base/content/test/favicons/file_favicon.png differ
diff --git a/browser/base/content/test/favicons/file_favicon.png^headers^ b/browser/base/content/test/favicons/file_favicon.png^headers^
new file mode 100644
index 000000000000..9e23c73b7ffb
--- /dev/null
+++ b/browser/base/content/test/favicons/file_favicon.png^headers^
@@ -0,0 +1 @@
+Cache-Control: no-cache
diff --git a/browser/base/content/test/favicons/file_favicon_thirdParty.html b/browser/base/content/test/favicons/file_favicon_thirdParty.html
new file mode 100644
index 000000000000..7d690e59815f
--- /dev/null
+++ b/browser/base/content/test/favicons/file_favicon_thirdParty.html
@@ -0,0 +1,11 @@
+
+
+
+
+ Favicon Test for originAttributes
+
+
+
+ Third Party Favicon!!
+
+
diff --git a/browser/base/content/test/performance/browser.ini b/browser/base/content/test/performance/browser.ini
index ae95dd95793f..a205aa431e9e 100644
--- a/browser/base/content/test/performance/browser.ini
+++ b/browser/base/content/test/performance/browser.ini
@@ -14,7 +14,6 @@ support-files =
head.js
[browser_appmenu_reflows.js]
skip-if = asan || debug # Bug 1382809, bug 1369959
-[browser_favicon_load.js]
[browser_startup.js]
[browser_startup_content.js]
skip-if = !e10s