diff --git a/testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py b/testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py
index ab2a45da8bc..5b4cbbcfed7 100644
--- a/testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py
+++ b/testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py
@@ -19,6 +19,7 @@ class TestStarInAutocomplete(FirefoxTestCase):
     def setUp(self):
         FirefoxTestCase.setUp(self)
 
+        self.bookmark_panel = None
         self.test_urls = [self.marionette.absolute_url('layout/mozilla_grants.html')]
 
         # Disable search suggestions to only get results for history and bookmarks
@@ -32,6 +33,11 @@ class TestStarInAutocomplete(FirefoxTestCase):
     def tearDown(self):
         # Close the autocomplete results
         try:
+            if self.bookmark_panel:
+                self.marionette.execute_script("""
+                  arguments[0].hidePopup();
+                """, script_args=[self.bookmark_panel])
+
             self.browser.navbar.locationbar.autocomplete_results.close()
             self.places.restore_default_bookmarks()
         finally:
@@ -55,8 +61,11 @@ class TestStarInAutocomplete(FirefoxTestCase):
                                           'menu_bookmarkThisPage')
 
         # TODO: Replace hard-coded selector with library method when one is available
+        self.bookmark_panel = self.marionette.find_element(By.ID, 'editBookmarkPanel')
         done_button = self.marionette.find_element(By.ID, 'editBookmarkPanelDoneButton')
-        Wait(self.marionette).until(lambda mn: done_button.is_displayed)
+
+        Wait(self.marionette).until(
+            lambda mn: self.bookmark_panel.get_attribute('panelopen') == 'true')
         done_button.click()
 
         # We must open the blank page so the autocomplete result isn't "Switch to tab"
diff --git a/testing/firefox-ui/tests/firefox_ui_tests/functional/security/manifest.ini b/testing/firefox-ui/tests/firefox_ui_tests/functional/security/manifest.ini
index 4682495346d..15291699cbd 100644
--- a/testing/firefox-ui/tests/firefox_ui_tests/functional/security/manifest.ini
+++ b/testing/firefox-ui/tests/firefox_ui_tests/functional/security/manifest.ini
@@ -14,7 +14,6 @@ tags = local
 [test_security_notification.py]
 [test_ssl_disabled_error_page.py]
 [test_ssl_status_after_restart.py]
-skip-if = os == "win"  # Bug 1167179: Fails to open popups after restart
 [test_submit_unencrypted_info_warning.py]
 [test_unknown_issuer.py]
 [test_untrusted_connection_error_page.py]
diff --git a/testing/firefox-ui/tests/firefox_ui_tests/resources/images/firefox_favicon.ico b/testing/firefox-ui/tests/firefox_ui_tests/resources/images/firefox_favicon.ico
new file mode 100644
index 00000000000..2c2f81768d4
Binary files /dev/null and b/testing/firefox-ui/tests/firefox_ui_tests/resources/images/firefox_favicon.ico differ
diff --git a/testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_favicon.ico b/testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_favicon.ico
new file mode 100644
index 00000000000..d44438903b7
Binary files /dev/null and b/testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_favicon.ico differ
diff --git a/testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_logo.jpg b/testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_logo.jpg
new file mode 100644
index 00000000000..231b385ee4d
Binary files /dev/null and b/testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_logo.jpg differ
diff --git a/testing/puppeteer/firefox/firefox_puppeteer/testcases/update.py b/testing/puppeteer/firefox/firefox_puppeteer/testcases/update.py
index 12ed538e494..aef924dfe9f 100644
--- a/testing/puppeteer/firefox/firefox_puppeteer/testcases/update.py
+++ b/testing/puppeteer/firefox/firefox_puppeteer/testcases/update.py
@@ -154,8 +154,7 @@ class UpdateTestCase(FirefoxTestCase):
 
             # No further updates should be offered now with the same update type
             if update_available:
-                about_window.download(wait_for_finish=False)
-
+                self.download_update(about_window, wait_for_finish=False)
                 self.assertNotEqual(self.software_update.active_update.type,
                                     self.updates[self.current_update_index].type)