diff --git a/client/package.json b/client/package.json
index d200780ed47..bdf3075a2e6 100644
--- a/client/package.json
+++ b/client/package.json
@@ -81,8 +81,8 @@
     "styleguide:build": "vue-styleguidist build",
     "test": "yarn run test-mocha && yarn run test-qunit",
     "test-watch": "yarn run test-mocha --no-single-run",
-    "test-qunit": "karma start test/karma/karma.config.qunit.js",
-    "test-mocha": "karma start test/karma/karma.config.mocha.js",
+    "test-qunit": "karma start tests/karma/karma.config.qunit.js",
+    "test-mocha": "karma start tests/karma/karma.config.mocha.js",
     "eslint": "eslint -c .eslintrc.js src --ext .js,.vue"
   },
   "devDependencies": {
diff --git a/client/src/components/Datatypes/test_fixtures.js b/client/src/components/Datatypes/test_fixtures.js
index 180f09b4cb1..abbad3e616b 100644
--- a/client/src/components/Datatypes/test_fixtures.js
+++ b/client/src/components/Datatypes/test_fixtures.js
@@ -1,6 +1,6 @@
 // TODO: Swap these awful relative paths to an alias
-import DatatypesMappingJson from "../../../test/qunit/test-data/json/datatypes.mapping.json";
-import DatatypesJson from "../../../test/qunit/test-data/json/datatypes.json";
+import DatatypesMappingJson from "../../../tests/qunit/test-data/json/datatypes.mapping.json";
+import DatatypesJson from "../../../tests/qunit/test-data/json/datatypes.json";
 import { DatatypesMapperModel } from "./model.js";
 
 export const typesAndMappingResponse = {
diff --git a/client/src/components/SelectionDialog/DatasetCollectionDialog.test.js b/client/src/components/SelectionDialog/DatasetCollectionDialog.test.js
index 550f8082e65..1ef99258961 100644
--- a/client/src/components/SelectionDialog/DatasetCollectionDialog.test.js
+++ b/client/src/components/SelectionDialog/DatasetCollectionDialog.test.js
@@ -1,8 +1,8 @@
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import DatasetCollectionDialog from "./DatasetCollectionDialog.vue";
-import { setupTestGalaxy } from "../../../test/qunit/test-app"; 
- import SelectionDialog from "./SelectionDialog.vue";
+import { setupTestGalaxy } from "../../../tests/qunit/test-app";
+import SelectionDialog from "./SelectionDialog.vue";
 
 import { shallowMount, createLocalVue } from "@vue/test-utils";
 
diff --git a/client/src/components/SelectionDialog/WorkflowDialog.test.js b/client/src/components/SelectionDialog/WorkflowDialog.test.js
index 7514b0e4845..fd1d217bf19 100644
--- a/client/src/components/SelectionDialog/WorkflowDialog.test.js
+++ b/client/src/components/SelectionDialog/WorkflowDialog.test.js
@@ -3,7 +3,7 @@ import axios from "axios";
 import WorkflowDialog from "./WorkflowDialog.vue";
 import { __RewireAPI__ as rewire } from "components/Workflow/services";
 import SelectionDialog from "./SelectionDialog.vue";
-import { setupTestGalaxy } from "../../../test/qunit/test-app";
+import { setupTestGalaxy } from "../../../tests/qunit/test-app";
 
 import { shallowMount, createLocalVue } from "@vue/test-utils";
 
diff --git a/client/src/components/Upload/UploadModal.test.js b/client/src/components/Upload/UploadModal.test.js
index 691bce07e3a..9c7ef154329 100644
--- a/client/src/components/Upload/UploadModal.test.js
+++ b/client/src/components/Upload/UploadModal.test.js
@@ -1,7 +1,7 @@
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import UploadModal from "./UploadModal.vue";
-import { setupTestGalaxy } from "../../../test/qunit/test-app";
+import { setupTestGalaxy } from "../../../tests/qunit/test-app";
 
 import { shallowMount, createLocalVue } from "@vue/test-utils";
 
diff --git a/client/test/karma/karma.config.base.js b/client/tests/karma/karma.config.base.js
similarity index 100%
rename from client/test/karma/karma.config.base.js
rename to client/tests/karma/karma.config.base.js
diff --git a/client/test/karma/karma.config.mocha.js b/client/tests/karma/karma.config.mocha.js
similarity index 100%
rename from client/test/karma/karma.config.mocha.js
rename to client/tests/karma/karma.config.mocha.js
diff --git a/client/test/karma/karma.config.qunit.js b/client/tests/karma/karma.config.qunit.js
similarity index 100%
rename from client/test/karma/karma.config.qunit.js
rename to client/tests/karma/karma.config.qunit.js
diff --git a/client/test/karma/webpack.config.qunit.js b/client/tests/karma/webpack.config.qunit.js
similarity index 100%
rename from client/test/karma/webpack.config.qunit.js
rename to client/tests/karma/webpack.config.qunit.js
diff --git a/client/test/karma/webpack.config.unittest.js b/client/tests/karma/webpack.config.unittest.js
similarity index 100%
rename from client/test/karma/webpack.config.unittest.js
rename to client/tests/karma/webpack.config.unittest.js
diff --git a/client/test/mocha/test.js b/client/tests/mocha/test.js
similarity index 100%
rename from client/test/mocha/test.js
rename to client/tests/mocha/test.js
diff --git a/client/test/mocha/tests/rules_dsl_spec.yml b/client/tests/mocha/tests/rules_dsl_spec.yml
similarity index 100%
rename from client/test/mocha/tests/rules_dsl_spec.yml
rename to client/tests/mocha/tests/rules_dsl_spec.yml
diff --git a/client/test/mocha/tests/rules_tests.js b/client/tests/mocha/tests/rules_tests.js
similarity index 100%
rename from client/test/mocha/tests/rules_tests.js
rename to client/tests/mocha/tests/rules_tests.js
diff --git a/client/test/qunit/test-app.js b/client/tests/qunit/test-app.js
similarity index 100%
rename from client/test/qunit/test-app.js
rename to client/tests/qunit/test-app.js
diff --git a/client/test/qunit/test-data/bootstrapped.js b/client/tests/qunit/test-data/bootstrapped.js
similarity index 100%
rename from client/test/qunit/test-data/bootstrapped.js
rename to client/tests/qunit/test-data/bootstrapped.js
diff --git a/client/test/qunit/test-data/fakeserver.js b/client/tests/qunit/test-data/fakeserver.js
similarity index 100%
rename from client/test/qunit/test-data/fakeserver.js
rename to client/tests/qunit/test-data/fakeserver.js
diff --git a/client/test/qunit/test-data/job-dag-1.js b/client/tests/qunit/test-data/job-dag-1.js
similarity index 100%
rename from client/test/qunit/test-data/job-dag-1.js
rename to client/tests/qunit/test-data/job-dag-1.js
diff --git a/client/test/qunit/test-data/json/datatypes.json b/client/tests/qunit/test-data/json/datatypes.json
similarity index 100%
rename from client/test/qunit/test-data/json/datatypes.json
rename to client/tests/qunit/test-data/json/datatypes.json
diff --git a/client/test/qunit/test-data/json/datatypes.mapping.json b/client/tests/qunit/test-data/json/datatypes.mapping.json
similarity index 100%
rename from client/test/qunit/test-data/json/datatypes.mapping.json
rename to client/tests/qunit/test-data/json/datatypes.mapping.json
diff --git a/client/test/qunit/test-data/json/tools.test.build.json b/client/tests/qunit/test-data/json/tools.test.build.json
similarity index 100%
rename from client/test/qunit/test-data/json/tools.test.build.json
rename to client/tests/qunit/test-data/json/tools.test.build.json
diff --git a/client/test/qunit/test-data/paired-collection-creator.data.js b/client/tests/qunit/test-data/paired-collection-creator.data.js
similarity index 100%
rename from client/test/qunit/test-data/paired-collection-creator.data.js
rename to client/tests/qunit/test-data/paired-collection-creator.data.js
diff --git a/client/test/qunit/test.js b/client/tests/qunit/test.js
similarity index 100%
rename from client/test/qunit/test.js
rename to client/tests/qunit/test.js
diff --git a/client/test/qunit/tests/form_tests.js b/client/tests/qunit/tests/form_tests.js
similarity index 100%
rename from client/test/qunit/tests/form_tests.js
rename to client/tests/qunit/tests/form_tests.js
diff --git a/client/test/qunit/tests/galaxy_app_base_tests.js b/client/tests/qunit/tests/galaxy_app_base_tests.js
similarity index 100%
rename from client/test/qunit/tests/galaxy_app_base_tests.js
rename to client/tests/qunit/tests/galaxy_app_base_tests.js
diff --git a/client/test/qunit/tests/graph_tests.js b/client/tests/qunit/tests/graph_tests.js
similarity index 100%
rename from client/test/qunit/tests/graph_tests.js
rename to client/tests/qunit/tests/graph_tests.js
diff --git a/client/test/qunit/tests/hda_base_tests.js b/client/tests/qunit/tests/hda_base_tests.js
similarity index 100%
rename from client/test/qunit/tests/hda_base_tests.js
rename to client/tests/qunit/tests/hda_base_tests.js
diff --git a/client/test/qunit/tests/history_contents_model_tests.js b/client/tests/qunit/tests/history_contents_model_tests.js
similarity index 100%
rename from client/test/qunit/tests/history_contents_model_tests.js
rename to client/tests/qunit/tests/history_contents_model_tests.js
diff --git a/client/test/qunit/tests/job_dag_tests.js b/client/tests/qunit/tests/job_dag_tests.js
similarity index 100%
rename from client/test/qunit/tests/job_dag_tests.js
rename to client/tests/qunit/tests/job_dag_tests.js
diff --git a/client/test/qunit/tests/jquery_plugin_tests.js b/client/tests/qunit/tests/jquery_plugin_tests.js
similarity index 100%
rename from client/test/qunit/tests/jquery_plugin_tests.js
rename to client/tests/qunit/tests/jquery_plugin_tests.js
diff --git a/client/test/qunit/tests/list_of_pairs_collection_creator_tests.js b/client/tests/qunit/tests/list_of_pairs_collection_creator_tests.js
similarity index 100%
rename from client/test/qunit/tests/list_of_pairs_collection_creator_tests.js
rename to client/tests/qunit/tests/list_of_pairs_collection_creator_tests.js
diff --git a/client/test/qunit/tests/metrics_logger_tests.js b/client/tests/qunit/tests/metrics_logger_tests.js
similarity index 100%
rename from client/test/qunit/tests/metrics_logger_tests.js
rename to client/tests/qunit/tests/metrics_logger_tests.js
diff --git a/client/test/qunit/tests/modal_tests.js b/client/tests/qunit/tests/modal_tests.js
similarity index 100%
rename from client/test/qunit/tests/modal_tests.js
rename to client/tests/qunit/tests/modal_tests.js
diff --git a/client/test/qunit/tests/ui_tests.js b/client/tests/qunit/tests/ui_tests.js
similarity index 100%
rename from client/test/qunit/tests/ui_tests.js
rename to client/tests/qunit/tests/ui_tests.js
diff --git a/client/test/qunit/tests/utils_tests.js b/client/tests/qunit/tests/utils_tests.js
similarity index 100%
rename from client/test/qunit/tests/utils_tests.js
rename to client/tests/qunit/tests/utils_tests.js
diff --git a/client/test/qunit/tests/workflow_editor_tests.js b/client/tests/qunit/tests/workflow_editor_tests.js
similarity index 100%
rename from client/test/qunit/tests/workflow_editor_tests.js
rename to client/tests/qunit/tests/workflow_editor_tests.js