diff --git a/client/src/qunit/assets/base.css b/client/src/qunit/assets/base.css
deleted file mode 120000
index 3656109388f..00000000000
--- a/client/src/qunit/assets/base.css
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../static/style/base.css
\ No newline at end of file
diff --git a/client/karma/karma.config.base.js b/client/test/karma/karma.config.base.js
similarity index 100%
rename from client/karma/karma.config.base.js
rename to client/test/karma/karma.config.base.js
diff --git a/client/karma/karma.config.mocha.js b/client/test/karma/karma.config.mocha.js
similarity index 100%
rename from client/karma/karma.config.mocha.js
rename to client/test/karma/karma.config.mocha.js
diff --git a/client/karma/karma.config.qunit.js b/client/test/karma/karma.config.qunit.js
similarity index 100%
rename from client/karma/karma.config.qunit.js
rename to client/test/karma/karma.config.qunit.js
diff --git a/client/karma/webpack.config.qunit.js b/client/test/karma/webpack.config.qunit.js
similarity index 100%
rename from client/karma/webpack.config.qunit.js
rename to client/test/karma/webpack.config.qunit.js
diff --git a/client/karma/webpack.config.unittest.js b/client/test/karma/webpack.config.unittest.js
similarity index 100%
rename from client/karma/webpack.config.unittest.js
rename to client/test/karma/webpack.config.unittest.js
diff --git a/client/src/mocha/test.js b/client/test/mocha/test.js
similarity index 100%
rename from client/src/mocha/test.js
rename to client/test/mocha/test.js
diff --git a/client/src/mocha/tests/rules_dsl_spec.yml b/client/test/mocha/tests/rules_dsl_spec.yml
similarity index 100%
rename from client/src/mocha/tests/rules_dsl_spec.yml
rename to client/test/mocha/tests/rules_dsl_spec.yml
diff --git a/client/src/mocha/tests/rules_tests.js b/client/test/mocha/tests/rules_tests.js
similarity index 100%
rename from client/src/mocha/tests/rules_tests.js
rename to client/test/mocha/tests/rules_tests.js
diff --git a/client/src/qunit/test-app.js b/client/test/qunit/test-app.js
similarity index 100%
rename from client/src/qunit/test-app.js
rename to client/test/qunit/test-app.js
diff --git a/client/src/qunit/test-data/bootstrapped.js b/client/test/qunit/test-data/bootstrapped.js
similarity index 100%
rename from client/src/qunit/test-data/bootstrapped.js
rename to client/test/qunit/test-data/bootstrapped.js
diff --git a/client/src/qunit/test-data/fakeserver.js b/client/test/qunit/test-data/fakeserver.js
similarity index 100%
rename from client/src/qunit/test-data/fakeserver.js
rename to client/test/qunit/test-data/fakeserver.js
diff --git a/client/src/qunit/test-data/job-dag-1.js b/client/test/qunit/test-data/job-dag-1.js
similarity index 100%
rename from client/src/qunit/test-data/job-dag-1.js
rename to client/test/qunit/test-data/job-dag-1.js
diff --git a/client/src/qunit/test-data/json/datatypes.json b/client/test/qunit/test-data/json/datatypes.json
similarity index 100%
rename from client/src/qunit/test-data/json/datatypes.json
rename to client/test/qunit/test-data/json/datatypes.json
diff --git a/client/src/qunit/test-data/json/datatypes.mapping.json b/client/test/qunit/test-data/json/datatypes.mapping.json
similarity index 100%
rename from client/src/qunit/test-data/json/datatypes.mapping.json
rename to client/test/qunit/test-data/json/datatypes.mapping.json
diff --git a/client/src/qunit/test-data/json/tools.test.build.json b/client/test/qunit/test-data/json/tools.test.build.json
similarity index 100%
rename from client/src/qunit/test-data/json/tools.test.build.json
rename to client/test/qunit/test-data/json/tools.test.build.json
diff --git a/client/src/qunit/test-data/paired-collection-creator.data.js b/client/test/qunit/test-data/paired-collection-creator.data.js
similarity index 100%
rename from client/src/qunit/test-data/paired-collection-creator.data.js
rename to client/test/qunit/test-data/paired-collection-creator.data.js
diff --git a/client/src/qunit/test.js b/client/test/qunit/test.js
similarity index 100%
rename from client/src/qunit/test.js
rename to client/test/qunit/test.js
diff --git a/client/src/qunit/tests/form_tests.js b/client/test/qunit/tests/form_tests.js
similarity index 100%
rename from client/src/qunit/tests/form_tests.js
rename to client/test/qunit/tests/form_tests.js
diff --git a/client/src/qunit/tests/galaxy_app_base_tests.js b/client/test/qunit/tests/galaxy_app_base_tests.js
similarity index 100%
rename from client/src/qunit/tests/galaxy_app_base_tests.js
rename to client/test/qunit/tests/galaxy_app_base_tests.js
diff --git a/client/src/qunit/tests/graph_tests.js b/client/test/qunit/tests/graph_tests.js
similarity index 100%
rename from client/src/qunit/tests/graph_tests.js
rename to client/test/qunit/tests/graph_tests.js
diff --git a/client/src/qunit/tests/hda_base_tests.js b/client/test/qunit/tests/hda_base_tests.js
similarity index 100%
rename from client/src/qunit/tests/hda_base_tests.js
rename to client/test/qunit/tests/hda_base_tests.js
diff --git a/client/src/qunit/tests/history_contents_model_tests.js b/client/test/qunit/tests/history_contents_model_tests.js
similarity index 100%
rename from client/src/qunit/tests/history_contents_model_tests.js
rename to client/test/qunit/tests/history_contents_model_tests.js
diff --git a/client/src/qunit/tests/job_dag_tests.js b/client/test/qunit/tests/job_dag_tests.js
similarity index 100%
rename from client/src/qunit/tests/job_dag_tests.js
rename to client/test/qunit/tests/job_dag_tests.js
diff --git a/client/src/qunit/tests/jquery_plugin_tests.js b/client/test/qunit/tests/jquery_plugin_tests.js
similarity index 100%
rename from client/src/qunit/tests/jquery_plugin_tests.js
rename to client/test/qunit/tests/jquery_plugin_tests.js
diff --git a/client/src/qunit/tests/list_of_pairs_collection_creator_tests.js b/client/test/qunit/tests/list_of_pairs_collection_creator_tests.js
similarity index 100%
rename from client/src/qunit/tests/list_of_pairs_collection_creator_tests.js
rename to client/test/qunit/tests/list_of_pairs_collection_creator_tests.js
diff --git a/client/src/qunit/tests/metrics_logger_tests.js b/client/test/qunit/tests/metrics_logger_tests.js
similarity index 100%
rename from client/src/qunit/tests/metrics_logger_tests.js
rename to client/test/qunit/tests/metrics_logger_tests.js
diff --git a/client/src/qunit/tests/modal_tests.js b/client/test/qunit/tests/modal_tests.js
similarity index 100%
rename from client/src/qunit/tests/modal_tests.js
rename to client/test/qunit/tests/modal_tests.js
diff --git a/client/src/qunit/tests/ui_tests.js b/client/test/qunit/tests/ui_tests.js
similarity index 100%
rename from client/src/qunit/tests/ui_tests.js
rename to client/test/qunit/tests/ui_tests.js
diff --git a/client/src/qunit/tests/utils_tests.js b/client/test/qunit/tests/utils_tests.js
similarity index 100%
rename from client/src/qunit/tests/utils_tests.js
rename to client/test/qunit/tests/utils_tests.js
diff --git a/client/src/qunit/tests/workflow_editor_tests.js b/client/test/qunit/tests/workflow_editor_tests.js
similarity index 100%
rename from client/src/qunit/tests/workflow_editor_tests.js
rename to client/test/qunit/tests/workflow_editor_tests.js