diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
index 90695eb419c..bf5fc05c688 100644
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -51,6 +51,11 @@ ARCHIVE_FILES = {
             'base': '_tests',
             'pattern': 'mozbase/**',
         },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing',
+            'pattern': 'firefox-ui/**',
+        },
         {
             'source': buildconfig.topsrcdir,
             'base': 'js/src',
@@ -81,6 +86,11 @@ ARCHIVE_FILES = {
             'pattern': 'jsapi.h',
             'dest': 'jit-test',
         },
+        {
+            'source': buildconfig.topsrcdir,
+            'base': 'testing',
+            'pattern': 'puppeteer/**',
+        },
         {
             'source': buildconfig.topsrcdir,
             'base': 'testing',
diff --git a/testing/config/firefox_ui_requirements.txt b/testing/config/firefox_ui_requirements.txt
new file mode 100644
index 00000000000..d32283c1850
--- /dev/null
+++ b/testing/config/firefox_ui_requirements.txt
@@ -0,0 +1,4 @@
+-r marionette_requirements.txt
+../firefox-ui/harness/
+../firefox-ui/tests/
+../puppeteer/firefox/