--- a/testing/config/firefox_ui_requirements.txt
+++ b/testing/config/firefox_ui_requirements.txt
@@ -1,4 +1,3 @@
 -r marionette_requirements.txt
 ../firefox-ui/harness/
-../firefox-ui/tests/
 ../puppeteer/firefox/

--- a/testing/firefox-ui/mach_commands.py
+++ b/testing/firefox-ui/mach_commands.py
@@ -44,17 +44,17 @@ def run_firefox_ui_test(testtype=None, t
         'update': {
             'default_tests': [
                 os.path.join('update', 'manifest.ini'),
             ],
             'cli_module': firefox_ui_harness.cli_update,
         }
     }
 
-    tests_root = os.path.join(topsrcdir, 'testing', 'firefox-ui', 'tests', 'firefox_ui_tests')
+    tests_root = os.path.join(topsrcdir, 'testing', 'firefox-ui', 'tests')
 
     # Set the resources path which is used to serve test data via wptserve
     if not kwargs['server_root']:
         kwargs['server_root'] = os.path.join(tests_root, 'resources')
 
     # If no tests have been selected, set default ones
     if not kwargs.get('tests'):
         kwargs['tests'] = [os.path.join(tests_root, test)

deleted file mode 100644
--- a/testing/firefox-ui/tests/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-exclude MANIFEST.in
-recursive-include firefox_ui_tests *

deleted file mode 100644
--- a/testing/firefox-ui/tests/firefox_ui_tests/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-import os
-
-root = os.path.abspath(os.path.dirname(__file__))
-
-manifest_all = os.path.join(root, 'manifest.ini')
-
-manifest_functional = os.path.join(root, 'functional', 'manifest.ini')
-
-manifest_update_direct = os.path.join(root, 'update', 'direct', 'manifest.ini')
-manifest_update_fallback = os.path.join(root, 'update', 'fallback', 'manifest.ini')
-
-resources = os.path.join(root, 'resources')

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/keyboard_shortcuts/manifest.ini
rename to testing/firefox-ui/tests/functional/keyboard_shortcuts/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/keyboard_shortcuts/test_browser_window.py
rename to testing/firefox-ui/tests/functional/keyboard_shortcuts/test_browser_window.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/manifest.ini
rename to testing/firefox-ui/tests/functional/locationbar/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_access_locationbar.py
rename to testing/firefox-ui/tests/functional/locationbar/test_access_locationbar.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_escape_autocomplete.py
rename to testing/firefox-ui/tests/functional/locationbar/test_escape_autocomplete.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_favicon_in_autocomplete.py
rename to testing/firefox-ui/tests/functional/locationbar/test_favicon_in_autocomplete.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/locationbar/test_suggest_bookmarks.py
rename to testing/firefox-ui/tests/functional/locationbar/test_suggest_bookmarks.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/manifest.ini
rename to testing/firefox-ui/tests/functional/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/private_browsing/manifest.ini
rename to testing/firefox-ui/tests/functional/private_browsing/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/private_browsing/test_about_private_browsing.py
rename to testing/firefox-ui/tests/functional/private_browsing/test_about_private_browsing.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/manifest.ini
rename to testing/firefox-ui/tests/functional/security/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_dv_certificate.py
rename to testing/firefox-ui/tests/functional/security/test_dv_certificate.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_enable_privilege.py
rename to testing/firefox-ui/tests/functional/security/test_enable_privilege.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_ev_certificate.py
rename to testing/firefox-ui/tests/functional/security/test_ev_certificate.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_mixed_content_page.py
rename to testing/firefox-ui/tests/functional/security/test_mixed_content_page.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_mixed_script_content_blocking.py
rename to testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_no_certificate.py
rename to testing/firefox-ui/tests/functional/security/test_no_certificate.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_safe_browsing_notification.py
rename to testing/firefox-ui/tests/functional/security/test_safe_browsing_notification.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_safe_browsing_warning_pages.py
rename to testing/firefox-ui/tests/functional/security/test_safe_browsing_warning_pages.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_security_notification.py
rename to testing/firefox-ui/tests/functional/security/test_security_notification.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_ssl_disabled_error_page.py
rename to testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_ssl_status_after_restart.py
rename to testing/firefox-ui/tests/functional/security/test_ssl_status_after_restart.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_submit_unencrypted_info_warning.py
rename to testing/firefox-ui/tests/functional/security/test_submit_unencrypted_info_warning.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_unknown_issuer.py
rename to testing/firefox-ui/tests/functional/security/test_unknown_issuer.py

rename from testing/firefox-ui/tests/firefox_ui_tests/functional/security/test_untrusted_connection_error_page.py
rename to testing/firefox-ui/tests/functional/security/test_untrusted_connection_error_page.py

rename from testing/firefox-ui/tests/firefox_ui_tests/manifest.ini
rename to testing/firefox-ui/tests/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/manifest.ini
rename to testing/firefox-ui/tests/puppeteer/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_about_window.py
rename to testing/firefox-ui/tests/puppeteer/test_about_window.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_appinfo.py
rename to testing/firefox-ui/tests/puppeteer/test_appinfo.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_l10n.py
rename to testing/firefox-ui/tests/puppeteer/test_l10n.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_menubar.py
rename to testing/firefox-ui/tests/puppeteer/test_menubar.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_page_info_window.py
rename to testing/firefox-ui/tests/puppeteer/test_page_info_window.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_places.py
rename to testing/firefox-ui/tests/puppeteer/test_places.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_prefs.py
rename to testing/firefox-ui/tests/puppeteer/test_prefs.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_security.py
rename to testing/firefox-ui/tests/puppeteer/test_security.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_software_update.py
rename to testing/firefox-ui/tests/puppeteer/test_software_update.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_tabbar.py
rename to testing/firefox-ui/tests/puppeteer/test_tabbar.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_toolbars.py
rename to testing/firefox-ui/tests/puppeteer/test_toolbars.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_update_wizard.py
rename to testing/firefox-ui/tests/puppeteer/test_update_wizard.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_utils.py
rename to testing/firefox-ui/tests/puppeteer/test_utils.py

rename from testing/firefox-ui/tests/firefox_ui_tests/puppeteer/test_windows.py
rename to testing/firefox-ui/tests/puppeteer/test_windows.py

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/cookies/cookie_single.html
rename to testing/firefox-ui/tests/resources/cookies/cookie_single.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/images/firefox_favicon.ico
rename to testing/firefox-ui/tests/resources/images/firefox_favicon.ico

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_favicon.ico
rename to testing/firefox-ui/tests/resources/images/mozilla_favicon.ico

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/images/mozilla_logo.jpg
rename to testing/firefox-ui/tests/resources/images/mozilla_logo.jpg

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla.html
rename to testing/firefox-ui/tests/resources/layout/mozilla.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_community.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_community.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_contribute.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_contribute.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_governance.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_governance.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_grants.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_grants.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_mission.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_mission.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_organizations.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_organizations.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/layout/mozilla_projects.html
rename to testing/firefox-ui/tests/resources/layout/mozilla_projects.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/private_browsing/about.html
rename to testing/firefox-ui/tests/resources/private_browsing/about.html

rename from testing/firefox-ui/tests/firefox_ui_tests/resources/security/enable_privilege.html
rename to testing/firefox-ui/tests/resources/security/enable_privilege.html

deleted file mode 100644
--- a/testing/firefox-ui/tests/setup.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this file,
-# You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from setuptools import setup, find_packages
-
-PACKAGE_VERSION = '0.3.1'
-
-deps = [
-    'firefox-puppeteer >= 3.2.0, <4.0.0',
-    'firefox-ui-harness == 1.2.0',
-]
-
-setup(name='firefox-ui-tests',
-      version=PACKAGE_VERSION,
-      description='A collection of Mozilla Firefox UI tests run with Marionette',
-      long_description='See https://github.com/mozilla/firefox-ui-tests',
-      classifiers=['Environment :: Console',
-                   'Intended Audience :: Developers',
-                   'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
-                   'Natural Language :: English',
-                   'Operating System :: OS Independent',
-                   'Programming Language :: Python',
-                   'Topic :: Software Development :: Libraries :: Python Modules',
-                   ],
-      keywords='mozilla',
-      author='Mozilla Automation and Tools Team',
-      author_email='tools@lists.mozilla.org',
-      url='https://github.com/mozilla/firefox-ui-tests',
-      license='MPL 2.0',
-      packages=find_packages(),
-      include_package_data=True,
-      package_data={
-          '': [
-              '*.html',
-              '*.ico',
-              '*.ini',
-              '*.jpg',
-              '*.js',
-          ]
-      },
-      zip_safe=False,
-      install_requires=deps,
-      )

rename from testing/firefox-ui/tests/firefox_ui_tests/update/direct/manifest.ini
rename to testing/firefox-ui/tests/update/direct/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/update/direct/test_direct_update.py
rename to testing/firefox-ui/tests/update/direct/test_direct_update.py

rename from testing/firefox-ui/tests/firefox_ui_tests/update/fallback/manifest.ini
rename to testing/firefox-ui/tests/update/fallback/manifest.ini

rename from testing/firefox-ui/tests/firefox_ui_tests/update/fallback/test_fallback_update.py
rename to testing/firefox-ui/tests/update/fallback/test_fallback_update.py

rename from testing/firefox-ui/tests/firefox_ui_tests/update/manifest.ini
rename to testing/firefox-ui/tests/update/manifest.ini

--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -203,22 +203,22 @@ class FirefoxUITests(TestingMixin, VCSTo
             if self.config.get('download_symbols'):
                 self._download_and_extract_symbols()
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
 
         abs_dirs = super(FirefoxUITests, self).query_abs_dirs()
-        tests_dir = os.path.join(abs_dirs['abs_work_dir'], 'tests')
+        abs_tests_install_dir = os.path.join(abs_dirs['abs_work_dir'], 'tests')
 
         dirs = {
             'abs_reports_dir': os.path.join(abs_dirs['base_work_dir'], 'reports'),
-            'abs_test_install_dir': tests_dir,
-            'fxui_tests_dir': os.path.join(tests_dir, 'firefox-ui', 'tests', 'firefox_ui_tests'),
+            'abs_test_install_dir': abs_tests_install_dir,
+            'abs_fxui_tests_dir': os.path.join(abs_tests_install_dir, 'firefox-ui', 'tests'),
         }
 
         for key in dirs:
             if key not in abs_dirs:
                 abs_dirs[key] = dirs[key]
         self.abs_dirs = abs_dirs
 
         return self.abs_dirs
@@ -298,17 +298,17 @@ class FirefoxUITests(TestingMixin, VCSTo
         cmd = [
             self.query_python_path(),
             os.path.join(os.path.dirname(firefox_ui_harness.__file__),
                          self.cli_script),
             '--binary', binary_path,
             '--address', 'localhost:{}'.format(marionette_port),
 
             # Resource files to serve via local webserver
-            '--server-root', os.path.join(dirs['fxui_tests_dir'], 'resources'),
+            '--server-root', os.path.join(dirs['abs_fxui_tests_dir'], 'resources'),
 
             # Use the work dir to get temporary data stored
             '--workspace', dirs['abs_work_dir'],
 
             # logging options
             '--gecko-log=-',  # output from the gecko process redirected to stdout
             '--log-raw=-',  # structured log for output parser redirected to stdout
 
@@ -329,17 +329,17 @@ class FirefoxUITests(TestingMixin, VCSTo
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
 
         parser = StructuredOutputParser(config=self.config,
                                         log_obj=self.log_obj,
                                         strict=False)
 
         # Add the top-level tests manifest file
-        cmd.append(os.path.join(dirs['fxui_tests_dir'], self.tests_manifest))
+        cmd.append(os.path.join(dirs['abs_fxui_tests_dir'], self.tests_manifest))
 
         return_code = self.run_command(cmd,
                                        cwd=dirs['abs_work_dir'],
                                        output_timeout=300,
                                        output_parser=parser,
                                        env=env)
 
         tbpl_status, log_level = parser.evaluate_parser(return_code)