--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -131,28 +131,25 @@ skip-if = true # browser_bug321000.js is
 skip-if = true # bug 428712
 [browser_bug424101.js]
 [browser_bug427559.js]
 [browser_bug431826.js]
 [browser_bug432599.js]
 [browser_bug435325.js]
 [browser_bug441778.js]
 [browser_bug455852.js]
-[browser_bug460146.js]
 [browser_bug462289.js]
 skip-if = toolkit == "cocoa"
 [browser_bug462673.js]
 [browser_bug477014.js]
 [browser_bug479408.js]
 [browser_bug481560.js]
 [browser_bug484315.js]
 [browser_bug491431.js]
 [browser_bug495058.js]
-[browser_bug517902.js]
-skip-if = (os == 'linux' && e10s) # bug 1161699
 [browser_bug519216.js]
 [browser_bug520538.js]
 [browser_bug521216.js]
 [browser_bug533232.js]
 [browser_bug537013.js]
 subsuite = clipboard
 skip-if = e10s # Bug 1134458 - Find bar doesn't work correctly in a detached tab
 [browser_bug537474.js]
@@ -275,17 +272,16 @@ subsuite = clipboard
 [browser_new_http_window_opened_from_file_tab.js]
 [browser_offlineQuotaNotification.js]
 skip-if = os == "linux" && !debug # bug 1304273
 [browser_feed_discovery.js]
 support-files = feed_discovery.html
 [browser_gZipOfflineChild.js]
 support-files = test_offline_gzip.html gZipOfflineChild.cacheManifest gZipOfflineChild.cacheManifest^headers^ gZipOfflineChild.html gZipOfflineChild.html^headers^
 [browser_overflowScroll.js]
-[browser_pageInfo.js]
 [browser_page_style_menu.js]
 [browser_page_style_menu_update.js]
 [browser_parsable_css.js]
 skip-if = debug # no point in running on both opt and debug, and will likely intermittently timeout on debug
 [browser_parsable_script.js]
 skip-if = asan || (os == 'linux' && !debug && (bits == 32)) # disabled on asan because of timeouts, and bug 1172468 for the linux 32-bit pgo issue.
 [browser_permissions.js]
 support-files =

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/pageinfo/.eslintrc.js
@@ -0,0 +1,7 @@
+"use strict";
+
+module.exports = {
+  "extends": [
+    "../../../../../testing/mochitest/browser.eslintrc.js"
+  ]
+};

new file mode 100644
--- /dev/null
+++ b/browser/base/content/test/pageinfo/browser.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+
+[browser_pageInfo.js]
+support-files =
+  ../general/feed_tab.html
+[browser_pageinfo_images.js]
+[browser_pageinfo_image_info.js]
+skip-if = (os == 'linux' && e10s) # bug 1161699

rename from browser/base/content/test/general/browser_pageInfo.js
rename to browser/base/content/test/pageinfo/browser_pageInfo.js
--- a/browser/base/content/test/general/browser_pageInfo.js
+++ b/browser/base/content/test/pageinfo/browser_pageInfo.js
@@ -4,17 +4,17 @@ function test() {
   var pageInfo;
 
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function() {
     Services.obs.addObserver(observer, "page-info-dialog-loaded", false);
     pageInfo = BrowserPageInfo();
   }, {capture: true, once: true});
   content.location =
-    "https://example.com/browser/browser/base/content/test/general/feed_tab.html";
+    "https://example.com/browser/browser/base/content/test/pageinfo/feed_tab.html";
 
   function observer(win, topic, data) {
     Services.obs.removeObserver(observer, "page-info-dialog-loaded");
     pageInfo.onFinished.push(handlePageInfo);
   }
 
   function handlePageInfo() {
     ok(pageInfo.document.getElementById("feedTab"), "Feed tab");

rename from browser/base/content/test/general/browser_bug517902.js
rename to browser/base/content/test/pageinfo/browser_pageinfo_image_info.js

rename from browser/base/content/test/general/browser_bug460146.js
rename to browser/base/content/test/pageinfo/browser_pageinfo_images.js

--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -14,16 +14,17 @@ MOCHITEST_CHROME_MANIFESTS += [
     'content/test/chrome/chrome.ini',
 ]
 
 BROWSER_CHROME_MANIFESTS += [
     'content/test/alerts/browser.ini',
     'content/test/captivePortal/browser.ini',
     'content/test/general/browser.ini',
     'content/test/newtab/browser.ini',
+    'content/test/pageinfo/browser.ini',
     'content/test/plugins/browser.ini',
     'content/test/popupNotifications/browser.ini',
     'content/test/referrer/browser.ini',
     'content/test/siteIdentity/browser.ini',
     'content/test/social/browser.ini',
     'content/test/tabcrashed/browser.ini',
     'content/test/tabPrompts/browser.ini',
     'content/test/tabs/browser.ini',