diff --git a/awx/ui/client/test/e2e/.babelrc b/awx/ui/test/e2e/.babelrc
similarity index 100%
rename from awx/ui/client/test/e2e/.babelrc
rename to awx/ui/test/e2e/.babelrc
diff --git a/awx/ui/client/test/e2e/README.md b/awx/ui/test/e2e/README.md
similarity index 100%
rename from awx/ui/client/test/e2e/README.md
rename to awx/ui/test/e2e/README.md
diff --git a/awx/ui/client/test/e2e/api.js b/awx/ui/test/e2e/api.js
similarity index 100%
rename from awx/ui/client/test/e2e/api.js
rename to awx/ui/test/e2e/api.js
diff --git a/awx/ui/client/test/e2e/cluster/devel-override.yml b/awx/ui/test/e2e/cluster/devel-override.yml
similarity index 100%
rename from awx/ui/client/test/e2e/cluster/devel-override.yml
rename to awx/ui/test/e2e/cluster/devel-override.yml
diff --git a/awx/ui/client/test/e2e/cluster/docker-compose.yml b/awx/ui/test/e2e/cluster/docker-compose.yml
similarity index 100%
rename from awx/ui/client/test/e2e/cluster/docker-compose.yml
rename to awx/ui/test/e2e/cluster/docker-compose.yml
diff --git a/awx/ui/client/test/e2e/commands/inject.js b/awx/ui/test/e2e/commands/inject.js
similarity index 100%
rename from awx/ui/client/test/e2e/commands/inject.js
rename to awx/ui/test/e2e/commands/inject.js
diff --git a/awx/ui/client/test/e2e/commands/login.js b/awx/ui/test/e2e/commands/login.js
similarity index 100%
rename from awx/ui/client/test/e2e/commands/login.js
rename to awx/ui/test/e2e/commands/login.js
diff --git a/awx/ui/client/test/e2e/commands/waitForAngular.js b/awx/ui/test/e2e/commands/waitForAngular.js
similarity index 100%
rename from awx/ui/client/test/e2e/commands/waitForAngular.js
rename to awx/ui/test/e2e/commands/waitForAngular.js
diff --git a/awx/ui/client/test/e2e/fixtures.js b/awx/ui/test/e2e/fixtures.js
similarity index 100%
rename from awx/ui/client/test/e2e/fixtures.js
rename to awx/ui/test/e2e/fixtures.js
diff --git a/awx/ui/client/test/e2e/nightwatch.conf.js b/awx/ui/test/e2e/nightwatch.conf.js
similarity index 100%
rename from awx/ui/client/test/e2e/nightwatch.conf.js
rename to awx/ui/test/e2e/nightwatch.conf.js
diff --git a/awx/ui/client/test/e2e/objects/activityStream.js b/awx/ui/test/e2e/objects/activityStream.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/activityStream.js
rename to awx/ui/test/e2e/objects/activityStream.js
diff --git a/awx/ui/client/test/e2e/objects/credentialTypes.js b/awx/ui/test/e2e/objects/credentialTypes.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/credentialTypes.js
rename to awx/ui/test/e2e/objects/credentialTypes.js
diff --git a/awx/ui/client/test/e2e/objects/credentials.js b/awx/ui/test/e2e/objects/credentials.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/credentials.js
rename to awx/ui/test/e2e/objects/credentials.js
diff --git a/awx/ui/client/test/e2e/objects/inventories.js b/awx/ui/test/e2e/objects/inventories.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/inventories.js
rename to awx/ui/test/e2e/objects/inventories.js
diff --git a/awx/ui/client/test/e2e/objects/inventoryScripts.js b/awx/ui/test/e2e/objects/inventoryScripts.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/inventoryScripts.js
rename to awx/ui/test/e2e/objects/inventoryScripts.js
diff --git a/awx/ui/client/test/e2e/objects/login.js b/awx/ui/test/e2e/objects/login.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/login.js
rename to awx/ui/test/e2e/objects/login.js
diff --git a/awx/ui/client/test/e2e/objects/notificationTemplates.js b/awx/ui/test/e2e/objects/notificationTemplates.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/notificationTemplates.js
rename to awx/ui/test/e2e/objects/notificationTemplates.js
diff --git a/awx/ui/client/test/e2e/objects/organizations.js b/awx/ui/test/e2e/objects/organizations.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/organizations.js
rename to awx/ui/test/e2e/objects/organizations.js
diff --git a/awx/ui/client/test/e2e/objects/projects.js b/awx/ui/test/e2e/objects/projects.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/projects.js
rename to awx/ui/test/e2e/objects/projects.js
diff --git a/awx/ui/client/test/e2e/objects/sections/actions.js b/awx/ui/test/e2e/objects/sections/actions.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/actions.js
rename to awx/ui/test/e2e/objects/sections/actions.js
diff --git a/awx/ui/client/test/e2e/objects/sections/breadcrumb.js b/awx/ui/test/e2e/objects/sections/breadcrumb.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/breadcrumb.js
rename to awx/ui/test/e2e/objects/sections/breadcrumb.js
diff --git a/awx/ui/client/test/e2e/objects/sections/createFormSection.js b/awx/ui/test/e2e/objects/sections/createFormSection.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/createFormSection.js
rename to awx/ui/test/e2e/objects/sections/createFormSection.js
diff --git a/awx/ui/client/test/e2e/objects/sections/createTableSection.js b/awx/ui/test/e2e/objects/sections/createTableSection.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/createTableSection.js
rename to awx/ui/test/e2e/objects/sections/createTableSection.js
diff --git a/awx/ui/client/test/e2e/objects/sections/dynamicSection.js b/awx/ui/test/e2e/objects/sections/dynamicSection.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/dynamicSection.js
rename to awx/ui/test/e2e/objects/sections/dynamicSection.js
diff --git a/awx/ui/client/test/e2e/objects/sections/header.js b/awx/ui/test/e2e/objects/sections/header.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/header.js
rename to awx/ui/test/e2e/objects/sections/header.js
diff --git a/awx/ui/client/test/e2e/objects/sections/lookupModal.js b/awx/ui/test/e2e/objects/sections/lookupModal.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/lookupModal.js
rename to awx/ui/test/e2e/objects/sections/lookupModal.js
diff --git a/awx/ui/client/test/e2e/objects/sections/navigation.js b/awx/ui/test/e2e/objects/sections/navigation.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/navigation.js
rename to awx/ui/test/e2e/objects/sections/navigation.js
diff --git a/awx/ui/client/test/e2e/objects/sections/pagination.js b/awx/ui/test/e2e/objects/sections/pagination.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/pagination.js
rename to awx/ui/test/e2e/objects/sections/pagination.js
diff --git a/awx/ui/client/test/e2e/objects/sections/permissions.js b/awx/ui/test/e2e/objects/sections/permissions.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/permissions.js
rename to awx/ui/test/e2e/objects/sections/permissions.js
diff --git a/awx/ui/client/test/e2e/objects/sections/search.js b/awx/ui/test/e2e/objects/sections/search.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/sections/search.js
rename to awx/ui/test/e2e/objects/sections/search.js
diff --git a/awx/ui/client/test/e2e/objects/teams.js b/awx/ui/test/e2e/objects/teams.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/teams.js
rename to awx/ui/test/e2e/objects/teams.js
diff --git a/awx/ui/client/test/e2e/objects/templates.js b/awx/ui/test/e2e/objects/templates.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/templates.js
rename to awx/ui/test/e2e/objects/templates.js
diff --git a/awx/ui/client/test/e2e/objects/users.js b/awx/ui/test/e2e/objects/users.js
similarity index 100%
rename from awx/ui/client/test/e2e/objects/users.js
rename to awx/ui/test/e2e/objects/users.js
diff --git a/awx/ui/client/test/e2e/runner.js b/awx/ui/test/e2e/runner.js
similarity index 100%
rename from awx/ui/client/test/e2e/runner.js
rename to awx/ui/test/e2e/runner.js
diff --git a/awx/ui/client/test/e2e/settings.js b/awx/ui/test/e2e/settings.js
similarity index 100%
rename from awx/ui/client/test/e2e/settings.js
rename to awx/ui/test/e2e/settings.js
diff --git a/awx/ui/client/test/e2e/tests/test-auditor-read-only-forms.js b/awx/ui/test/e2e/tests/test-auditor-read-only-forms.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-auditor-read-only-forms.js
rename to awx/ui/test/e2e/tests/test-auditor-read-only-forms.js
diff --git a/awx/ui/client/test/e2e/tests/test-credential-types-add-edit.js b/awx/ui/test/e2e/tests/test-credential-types-add-edit.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credential-types-add-edit.js
rename to awx/ui/test/e2e/tests/test-credential-types-add-edit.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-aws.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-aws.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-aws.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-aws.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-custom.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-custom.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-custom.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-custom.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-gce.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-gce.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-gce.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-gce.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-insights.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-insights.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-insights.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-insights.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-machine.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-machine.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-machine.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-network.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-network.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-network.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-network.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-scm.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-scm.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-scm.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-scm.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-add-edit-vault.js b/awx/ui/test/e2e/tests/test-credentials-add-edit-vault.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-add-edit-vault.js
rename to awx/ui/test/e2e/tests/test-credentials-add-edit-vault.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-lookup-credential-type.js b/awx/ui/test/e2e/tests/test-credentials-lookup-credential-type.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-lookup-credential-type.js
rename to awx/ui/test/e2e/tests/test-credentials-lookup-credential-type.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-lookup-organization.js b/awx/ui/test/e2e/tests/test-credentials-lookup-organization.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-lookup-organization.js
rename to awx/ui/test/e2e/tests/test-credentials-lookup-organization.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-navigation-click-through.js b/awx/ui/test/e2e/tests/test-credentials-navigation-click-through.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-navigation-click-through.js
rename to awx/ui/test/e2e/tests/test-credentials-navigation-click-through.js
diff --git a/awx/ui/client/test/e2e/tests/test-credentials-search-sort.js b/awx/ui/test/e2e/tests/test-credentials-search-sort.js
similarity index 100%
rename from awx/ui/client/test/e2e/tests/test-credentials-search-sort.js
rename to awx/ui/test/e2e/tests/test-credentials-search-sort.js
diff --git a/awx/ui/tests/spec/column-sort/column-sort.directive-test.js b/awx/ui/test/spec/column-sort/column-sort.directive-test.js
similarity index 100%
rename from awx/ui/tests/spec/column-sort/column-sort.directive-test.js
rename to awx/ui/test/spec/column-sort/column-sort.directive-test.js
diff --git a/awx/ui/tests/spec/features/features.directive-test.js b/awx/ui/test/spec/features/features.directive-test.js
similarity index 100%
rename from awx/ui/tests/spec/features/features.directive-test.js
rename to awx/ui/test/spec/features/features.directive-test.js
diff --git a/awx/ui/tests/spec/inventories/insights/data/high.insights-data.js b/awx/ui/test/spec/inventories/insights/data/high.insights-data.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/data/high.insights-data.js
rename to awx/ui/test/spec/inventories/insights/data/high.insights-data.js
diff --git a/awx/ui/tests/spec/inventories/insights/data/insights-data.js b/awx/ui/test/spec/inventories/insights/data/insights-data.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/data/insights-data.js
rename to awx/ui/test/spec/inventories/insights/data/insights-data.js
diff --git a/awx/ui/tests/spec/inventories/insights/data/low.insights-data.js b/awx/ui/test/spec/inventories/insights/data/low.insights-data.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/data/low.insights-data.js
rename to awx/ui/test/spec/inventories/insights/data/low.insights-data.js
diff --git a/awx/ui/tests/spec/inventories/insights/data/medium.insights-data.js b/awx/ui/test/spec/inventories/insights/data/medium.insights-data.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/data/medium.insights-data.js
rename to awx/ui/test/spec/inventories/insights/data/medium.insights-data.js
diff --git a/awx/ui/tests/spec/inventories/insights/data/not_solvable.insights-data.js b/awx/ui/test/spec/inventories/insights/data/not_solvable.insights-data.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/data/not_solvable.insights-data.js
rename to awx/ui/test/spec/inventories/insights/data/not_solvable.insights-data.js
diff --git a/awx/ui/tests/spec/inventories/insights/data/solvable.insights-data.js b/awx/ui/test/spec/inventories/insights/data/solvable.insights-data.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/data/solvable.insights-data.js
rename to awx/ui/test/spec/inventories/insights/data/solvable.insights-data.js
diff --git a/awx/ui/tests/spec/inventories/insights/insights.service-test.js b/awx/ui/test/spec/inventories/insights/insights.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/insights/insights.service-test.js
rename to awx/ui/test/spec/inventories/insights/insights.service-test.js
diff --git a/awx/ui/tests/spec/inventories/manage/inventory-manage.service-test.js b/awx/ui/test/spec/inventories/manage/inventory-manage.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/inventories/manage/inventory-manage.service-test.js
rename to awx/ui/test/spec/inventories/manage/inventory-manage.service-test.js
diff --git a/awx/ui/tests/spec/job-results/job-results.controller-test.js b/awx/ui/test/spec/job-results/job-results.controller-test.js
similarity index 100%
rename from awx/ui/tests/spec/job-results/job-results.controller-test.js
rename to awx/ui/test/spec/job-results/job-results.controller-test.js
diff --git a/awx/ui/tests/spec/job-results/job-results.service-test.js b/awx/ui/test/spec/job-results/job-results.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/job-results/job-results.service-test.js
rename to awx/ui/test/spec/job-results/job-results.service-test.js
diff --git a/awx/ui/tests/spec/job-results/parse-stdout.service-test.js b/awx/ui/test/spec/job-results/parse-stdout.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/job-results/parse-stdout.service-test.js
rename to awx/ui/test/spec/job-results/parse-stdout.service-test.js
diff --git a/awx/ui/tests/spec/license/license.controller-test.js b/awx/ui/test/spec/license/license.controller-test.js
similarity index 100%
rename from awx/ui/tests/spec/license/license.controller-test.js
rename to awx/ui/test/spec/license/license.controller-test.js
diff --git a/awx/ui/tests/spec/lookup/lookup-modal.directive-test.js b/awx/ui/test/spec/lookup/lookup-modal.directive-test.js
similarity index 100%
rename from awx/ui/tests/spec/lookup/lookup-modal.directive-test.js
rename to awx/ui/test/spec/lookup/lookup-modal.directive-test.js
diff --git a/awx/ui/tests/spec/multi-credential/multi-credential.service-test.js b/awx/ui/test/spec/multi-credential/multi-credential.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/multi-credential/multi-credential.service-test.js
rename to awx/ui/test/spec/multi-credential/multi-credential.service-test.js
diff --git a/awx/ui/tests/spec/paginate/paginate.directive-test.js b/awx/ui/test/spec/paginate/paginate.directive-test.js
similarity index 100%
rename from awx/ui/tests/spec/paginate/paginate.directive-test.js
rename to awx/ui/test/spec/paginate/paginate.directive-test.js
diff --git a/awx/ui/tests/spec/shared/filters/append.filter-test.js b/awx/ui/test/spec/shared/filters/append.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/append.filter-test.js
rename to awx/ui/test/spec/shared/filters/append.filter-test.js
diff --git a/awx/ui/tests/spec/shared/filters/capitalize.filter-test.js b/awx/ui/test/spec/shared/filters/capitalize.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/capitalize.filter-test.js
rename to awx/ui/test/spec/shared/filters/capitalize.filter-test.js
diff --git a/awx/ui/tests/spec/shared/filters/format-epoch.filter-test.js b/awx/ui/test/spec/shared/filters/format-epoch.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/format-epoch.filter-test.js
rename to awx/ui/test/spec/shared/filters/format-epoch.filter-test.js
diff --git a/awx/ui/tests/spec/shared/filters/is-empty.filter-test.js b/awx/ui/test/spec/shared/filters/is-empty.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/is-empty.filter-test.js
rename to awx/ui/test/spec/shared/filters/is-empty.filter-test.js
diff --git a/awx/ui/tests/spec/shared/filters/long-date.filter-test.js b/awx/ui/test/spec/shared/filters/long-date.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/long-date.filter-test.js
rename to awx/ui/test/spec/shared/filters/long-date.filter-test.js
diff --git a/awx/ui/tests/spec/shared/filters/prepend.filter-test.js b/awx/ui/test/spec/shared/filters/prepend.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/prepend.filter-test.js
rename to awx/ui/test/spec/shared/filters/prepend.filter-test.js
diff --git a/awx/ui/tests/spec/shared/filters/xss-sanitizer.filter-test.js b/awx/ui/test/spec/shared/filters/xss-sanitizer.filter-test.js
similarity index 100%
rename from awx/ui/tests/spec/shared/filters/xss-sanitizer.filter-test.js
rename to awx/ui/test/spec/shared/filters/xss-sanitizer.filter-test.js
diff --git a/awx/ui/tests/spec/smart-search/queryset.service-test.js b/awx/ui/test/spec/smart-search/queryset.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/smart-search/queryset.service-test.js
rename to awx/ui/test/spec/smart-search/queryset.service-test.js
diff --git a/awx/ui/tests/spec/smart-search/smart-search.directive-test.js b/awx/ui/test/spec/smart-search/smart-search.directive-test.js
similarity index 100%
rename from awx/ui/tests/spec/smart-search/smart-search.directive-test.js
rename to awx/ui/test/spec/smart-search/smart-search.directive-test.js
diff --git a/awx/ui/tests/spec/smart-search/smart-search.service-test.js b/awx/ui/test/spec/smart-search/smart-search.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/smart-search/smart-search.service-test.js
rename to awx/ui/test/spec/smart-search/smart-search.service-test.js
diff --git a/awx/ui/tests/spec/socket/socket.service-test.js b/awx/ui/test/spec/socket/socket.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/socket/socket.service-test.js
rename to awx/ui/test/spec/socket/socket.service-test.js
diff --git a/awx/ui/tests/spec/templates/templates-list.controller-test.js b/awx/ui/test/spec/templates/templates-list.controller-test.js
similarity index 100%
rename from awx/ui/tests/spec/templates/templates-list.controller-test.js
rename to awx/ui/test/spec/templates/templates-list.controller-test.js
diff --git a/awx/ui/tests/spec/workflow--results/data/workflow_job.js b/awx/ui/test/spec/workflow--results/data/workflow_job.js
similarity index 100%
rename from awx/ui/tests/spec/workflow--results/data/workflow_job.js
rename to awx/ui/test/spec/workflow--results/data/workflow_job.js
diff --git a/awx/ui/tests/spec/workflow--results/data/workflow_job_options.js b/awx/ui/test/spec/workflow--results/data/workflow_job_options.js
similarity index 100%
rename from awx/ui/tests/spec/workflow--results/data/workflow_job_options.js
rename to awx/ui/test/spec/workflow--results/data/workflow_job_options.js
diff --git a/awx/ui/tests/spec/workflow--results/workflow-results.controller-test.js b/awx/ui/test/spec/workflow--results/workflow-results.controller-test.js
similarity index 100%
rename from awx/ui/tests/spec/workflow--results/workflow-results.controller-test.js
rename to awx/ui/test/spec/workflow--results/workflow-results.controller-test.js
diff --git a/awx/ui/tests/spec/workflow--results/workflow-results.service-test.js b/awx/ui/test/spec/workflow--results/workflow-results.service-test.js
similarity index 100%
rename from awx/ui/tests/spec/workflow--results/workflow-results.service-test.js
rename to awx/ui/test/spec/workflow--results/workflow-results.service-test.js
diff --git a/awx/ui/tests/spec/workflows/workflow-add.controller-test.js b/awx/ui/test/spec/workflows/workflow-add.controller-test.js
similarity index 100%
rename from awx/ui/tests/spec/workflows/workflow-add.controller-test.js
rename to awx/ui/test/spec/workflows/workflow-add.controller-test.js
diff --git a/awx/ui/tests/spec/workflows/workflow-maker.controller-test.js b/awx/ui/test/spec/workflows/workflow-maker.controller-test.js
similarity index 100%
rename from awx/ui/tests/spec/workflows/workflow-maker.controller-test.js
rename to awx/ui/test/spec/workflows/workflow-maker.controller-test.js
diff --git a/awx/ui/client/test/unit/index.js b/awx/ui/test/unit/index.js
similarity index 100%
rename from awx/ui/client/test/unit/index.js
rename to awx/ui/test/unit/index.js
diff --git a/awx/ui/client/test/unit/karma.conf.js b/awx/ui/test/unit/karma.conf.js
similarity index 100%
rename from awx/ui/client/test/unit/karma.conf.js
rename to awx/ui/test/unit/karma.conf.js
diff --git a/awx/ui/client/test/unit/layout.spec.js b/awx/ui/test/unit/layout.spec.js
similarity index 100%
rename from awx/ui/client/test/unit/layout.spec.js
rename to awx/ui/test/unit/layout.spec.js
diff --git a/awx/ui/client/test/unit/side-nav-item.spec.js b/awx/ui/test/unit/side-nav-item.spec.js
similarity index 100%
rename from awx/ui/client/test/unit/side-nav-item.spec.js
rename to awx/ui/test/unit/side-nav-item.spec.js
diff --git a/awx/ui/client/test/unit/side-nav.spec.js b/awx/ui/test/unit/side-nav.spec.js
similarity index 100%
rename from awx/ui/client/test/unit/side-nav.spec.js
rename to awx/ui/test/unit/side-nav.spec.js