diff --git a/testing/firefox-ui/tests/functional/safebrowsing/manifest.ini b/testing/firefox-ui/tests/functional/safebrowsing/manifest.ini
new file mode 100644
index 000000000000..98de626e1952
--- /dev/null
+++ b/testing/firefox-ui/tests/functional/safebrowsing/manifest.ini
@@ -0,0 +1,7 @@
+[DEFAULT]
+tags = remote
+
+[test_initial_download.py]
+skip-if = debug || asan # the GAPI key isn't available in debug or asan builds
+[test_notification.py]
+[test_warning_pages.py]
diff --git a/testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py b/testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py
similarity index 100%
rename from testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
rename to testing/firefox-ui/tests/functional/safebrowsing/test_initial_download.py
diff --git a/testing/firefox-ui/tests/functional/security/test_safe_browsing_notification.py b/testing/firefox-ui/tests/functional/safebrowsing/test_notification.py
similarity index 100%
rename from testing/firefox-ui/tests/functional/security/test_safe_browsing_notification.py
rename to testing/firefox-ui/tests/functional/safebrowsing/test_notification.py
diff --git a/testing/firefox-ui/tests/functional/security/test_safe_browsing_warning_pages.py b/testing/firefox-ui/tests/functional/safebrowsing/test_warning_pages.py
similarity index 100%
rename from testing/firefox-ui/tests/functional/security/test_safe_browsing_warning_pages.py
rename to testing/firefox-ui/tests/functional/safebrowsing/test_warning_pages.py
diff --git a/testing/firefox-ui/tests/functional/security/manifest.ini b/testing/firefox-ui/tests/functional/security/manifest.ini
index c7e98f5dc5bb..74f25c842b09 100644
--- a/testing/firefox-ui/tests/functional/security/manifest.ini
+++ b/testing/firefox-ui/tests/functional/security/manifest.ini
@@ -9,10 +9,6 @@ tags = local
 [test_mixed_script_content_blocking.py]
 [test_no_certificate.py]
 tags = local
-[test_safe_browsing_initial_download.py]
-skip-if = debug || asan # the GAPI key isn't available in debug or asan builds
-[test_safe_browsing_notification.py]
-[test_safe_browsing_warning_pages.py]
 [test_security_notification.py]
 [test_ssl_disabled_error_page.py]
 [test_ssl_status_after_restart.py]