diff --git a/resources/static/test/qunit/controllers/actions_unit_test.js b/resources/static/test/cases/controllers/actions.js
similarity index 100%
rename from resources/static/test/qunit/controllers/actions_unit_test.js
rename to resources/static/test/cases/controllers/actions.js
diff --git a/resources/static/test/qunit/controllers/add_email_unit_test.js b/resources/static/test/cases/controllers/add_email.js
similarity index 100%
rename from resources/static/test/qunit/controllers/add_email_unit_test.js
rename to resources/static/test/cases/controllers/add_email.js
diff --git a/resources/static/test/qunit/controllers/authenticate_unit_test.js b/resources/static/test/cases/controllers/authenticate.js
similarity index 100%
rename from resources/static/test/qunit/controllers/authenticate_unit_test.js
rename to resources/static/test/cases/controllers/authenticate.js
diff --git a/resources/static/test/qunit/controllers/check_registration_unit_test.js b/resources/static/test/cases/controllers/check_registration.js
similarity index 100%
rename from resources/static/test/qunit/controllers/check_registration_unit_test.js
rename to resources/static/test/cases/controllers/check_registration.js
diff --git a/resources/static/test/qunit/controllers/dialog_unit_test.js b/resources/static/test/cases/controllers/dialog.js
similarity index 100%
rename from resources/static/test/qunit/controllers/dialog_unit_test.js
rename to resources/static/test/cases/controllers/dialog.js
diff --git a/resources/static/test/qunit/controllers/email_chosen_unit_test.js b/resources/static/test/cases/controllers/email_chosen.js
similarity index 100%
rename from resources/static/test/qunit/controllers/email_chosen_unit_test.js
rename to resources/static/test/cases/controllers/email_chosen.js
diff --git a/resources/static/test/qunit/controllers/forgot_password_unit_test.js b/resources/static/test/cases/controllers/forgot_password.js
similarity index 100%
rename from resources/static/test/qunit/controllers/forgot_password_unit_test.js
rename to resources/static/test/cases/controllers/forgot_password.js
diff --git a/resources/static/test/qunit/controllers/pick_email_unit_test.js b/resources/static/test/cases/controllers/pick_email.js
similarity index 100%
rename from resources/static/test/qunit/controllers/pick_email_unit_test.js
rename to resources/static/test/cases/controllers/pick_email.js
diff --git a/resources/static/test/qunit/controllers/primary_user_provisioned_unit_test.js b/resources/static/test/cases/controllers/primary_user_provisioned.js
similarity index 100%
rename from resources/static/test/qunit/controllers/primary_user_provisioned_unit_test.js
rename to resources/static/test/cases/controllers/primary_user_provisioned.js
diff --git a/resources/static/test/qunit/controllers/provision_primary_user_unit_test.js b/resources/static/test/cases/controllers/provision_primary_user.js
similarity index 100%
rename from resources/static/test/qunit/controllers/provision_primary_user_unit_test.js
rename to resources/static/test/cases/controllers/provision_primary_user.js
diff --git a/resources/static/test/qunit/controllers/required_email_unit_test.js b/resources/static/test/cases/controllers/required_email.js
similarity index 100%
rename from resources/static/test/qunit/controllers/required_email_unit_test.js
rename to resources/static/test/cases/controllers/required_email.js
diff --git a/resources/static/test/qunit/controllers/verify_primary_user_unit_test.js b/resources/static/test/cases/controllers/verify_primary_user.js
similarity index 100%
rename from resources/static/test/qunit/controllers/verify_primary_user_unit_test.js
rename to resources/static/test/cases/controllers/verify_primary_user.js
diff --git a/resources/static/test/qunit/dialog_test.js b/resources/static/test/cases/dialog.js
similarity index 100%
rename from resources/static/test/qunit/dialog_test.js
rename to resources/static/test/cases/dialog.js
diff --git a/resources/static/test/qunit/include_unit_test.js b/resources/static/test/cases/include.js
similarity index 100%
rename from resources/static/test/qunit/include_unit_test.js
rename to resources/static/test/cases/include.js
diff --git a/resources/static/test/qunit/pages/add_email_address_test.js b/resources/static/test/cases/pages/add_email_address_test.js
similarity index 100%
rename from resources/static/test/qunit/pages/add_email_address_test.js
rename to resources/static/test/cases/pages/add_email_address_test.js
diff --git a/resources/static/test/qunit/pages/browserid_unit_test.js b/resources/static/test/cases/pages/browserid.js
similarity index 100%
rename from resources/static/test/qunit/pages/browserid_unit_test.js
rename to resources/static/test/cases/pages/browserid.js
diff --git a/resources/static/test/qunit/pages/forgot_unit_test.js b/resources/static/test/cases/pages/forgot.js
similarity index 100%
rename from resources/static/test/qunit/pages/forgot_unit_test.js
rename to resources/static/test/cases/pages/forgot.js
diff --git a/resources/static/test/qunit/pages/manage_account_unit_test.js b/resources/static/test/cases/pages/manage_account.js
similarity index 100%
rename from resources/static/test/qunit/pages/manage_account_unit_test.js
rename to resources/static/test/cases/pages/manage_account.js
diff --git a/resources/static/test/qunit/pages/page_helpers_unit_test.js b/resources/static/test/cases/pages/page_helpers.js
similarity index 100%
rename from resources/static/test/qunit/pages/page_helpers_unit_test.js
rename to resources/static/test/cases/pages/page_helpers.js
diff --git a/resources/static/test/qunit/pages/signin_unit_test.js b/resources/static/test/cases/pages/signin.js
similarity index 100%
rename from resources/static/test/qunit/pages/signin_unit_test.js
rename to resources/static/test/cases/pages/signin.js
diff --git a/resources/static/test/qunit/pages/signup_unit_test.js b/resources/static/test/cases/pages/signup.js
similarity index 100%
rename from resources/static/test/qunit/pages/signup_unit_test.js
rename to resources/static/test/cases/pages/signup.js
diff --git a/resources/static/test/qunit/pages/verify_email_address_test.js b/resources/static/test/cases/pages/verify_email_address_test.js
similarity index 100%
rename from resources/static/test/qunit/pages/verify_email_address_test.js
rename to resources/static/test/cases/pages/verify_email_address_test.js
diff --git a/resources/static/test/qunit/resources/helpers_unit_test.js b/resources/static/test/cases/resources/helpers.js
similarity index 100%
rename from resources/static/test/qunit/resources/helpers_unit_test.js
rename to resources/static/test/cases/resources/helpers.js
diff --git a/resources/static/test/qunit/resources/internal_api_unit_test.js b/resources/static/test/cases/resources/internal_api.js
similarity index 100%
rename from resources/static/test/qunit/resources/internal_api_unit_test.js
rename to resources/static/test/cases/resources/internal_api.js
diff --git a/resources/static/test/qunit/resources/state_machine_unit_test.js b/resources/static/test/cases/resources/state_machine.js
similarity index 100%
rename from resources/static/test/qunit/resources/state_machine_unit_test.js
rename to resources/static/test/cases/resources/state_machine.js
diff --git a/resources/static/test/qunit/shared/browser-support_unit_test.js b/resources/static/test/cases/shared/browser-support.js
similarity index 100%
rename from resources/static/test/qunit/shared/browser-support_unit_test.js
rename to resources/static/test/cases/shared/browser-support.js
diff --git a/resources/static/test/qunit/shared/class_unit_test.js b/resources/static/test/cases/shared/class.js
similarity index 100%
rename from resources/static/test/qunit/shared/class_unit_test.js
rename to resources/static/test/cases/shared/class.js
diff --git a/resources/static/test/qunit/shared/error-display_unit_test.js b/resources/static/test/cases/shared/error-display.js
similarity index 100%
rename from resources/static/test/qunit/shared/error-display_unit_test.js
rename to resources/static/test/cases/shared/error-display.js
diff --git a/resources/static/test/qunit/shared/helpers_unit_test.js b/resources/static/test/cases/shared/helpers.js
similarity index 100%
rename from resources/static/test/qunit/shared/helpers_unit_test.js
rename to resources/static/test/cases/shared/helpers.js
diff --git a/resources/static/test/qunit/shared/modules/code_check_unit_test.js b/resources/static/test/cases/shared/modules/code_check.js
similarity index 100%
rename from resources/static/test/qunit/shared/modules/code_check_unit_test.js
rename to resources/static/test/cases/shared/modules/code_check.js
diff --git a/resources/static/test/qunit/shared/modules/cookie_check_unit_test.js b/resources/static/test/cases/shared/modules/cookie_check.js
similarity index 100%
rename from resources/static/test/qunit/shared/modules/cookie_check_unit_test.js
rename to resources/static/test/cases/shared/modules/cookie_check.js
diff --git a/resources/static/test/qunit/shared/modules/page_module_unit_test.js b/resources/static/test/cases/shared/modules/page_module.js
similarity index 100%
rename from resources/static/test/qunit/shared/modules/page_module_unit_test.js
rename to resources/static/test/cases/shared/modules/page_module.js
diff --git a/resources/static/test/qunit/shared/modules/xhr_delay_unit_test.js b/resources/static/test/cases/shared/modules/xhr_delay.js
similarity index 100%
rename from resources/static/test/qunit/shared/modules/xhr_delay_unit_test.js
rename to resources/static/test/cases/shared/modules/xhr_delay.js
diff --git a/resources/static/test/qunit/shared/modules/xhr_disable_form_unit_test.js b/resources/static/test/cases/shared/modules/xhr_disable_form.js
similarity index 100%
rename from resources/static/test/qunit/shared/modules/xhr_disable_form_unit_test.js
rename to resources/static/test/cases/shared/modules/xhr_disable_form.js
diff --git a/resources/static/test/qunit/shared/network_unit_test.js b/resources/static/test/cases/shared/network.js
similarity index 100%
rename from resources/static/test/qunit/shared/network_unit_test.js
rename to resources/static/test/cases/shared/network.js
diff --git a/resources/static/test/qunit/shared/renderer_unit_test.js b/resources/static/test/cases/shared/renderer.js
similarity index 100%
rename from resources/static/test/qunit/shared/renderer_unit_test.js
rename to resources/static/test/cases/shared/renderer.js
diff --git a/resources/static/test/qunit/shared/screens_unit_test.js b/resources/static/test/cases/shared/screens.js
similarity index 100%
rename from resources/static/test/qunit/shared/screens_unit_test.js
rename to resources/static/test/cases/shared/screens.js
diff --git a/resources/static/test/qunit/shared/storage_unit_test.js b/resources/static/test/cases/shared/storage.js
similarity index 100%
rename from resources/static/test/qunit/shared/storage_unit_test.js
rename to resources/static/test/cases/shared/storage.js
diff --git a/resources/static/test/qunit/shared/tooltip_unit_test.js b/resources/static/test/cases/shared/tooltip.js
similarity index 100%
rename from resources/static/test/qunit/shared/tooltip_unit_test.js
rename to resources/static/test/cases/shared/tooltip.js
diff --git a/resources/static/test/qunit/shared/user_unit_test.js b/resources/static/test/cases/shared/user.js
similarity index 100%
rename from resources/static/test/qunit/shared/user_unit_test.js
rename to resources/static/test/cases/shared/user.js
diff --git a/resources/static/test/qunit/shared/validation_unit_test.js b/resources/static/test/cases/shared/validation.js
similarity index 100%
rename from resources/static/test/qunit/shared/validation_unit_test.js
rename to resources/static/test/cases/shared/validation.js
diff --git a/resources/static/test/qunit/shared/xhr_unit_test.js b/resources/static/test/cases/shared/xhr.js
similarity index 100%
rename from resources/static/test/qunit/shared/xhr_unit_test.js
rename to resources/static/test/cases/shared/xhr.js
diff --git a/resources/static/test/qunit/mocks/mocks.js b/resources/static/test/mocks/mocks.js
similarity index 100%
rename from resources/static/test/qunit/mocks/mocks.js
rename to resources/static/test/mocks/mocks.js
diff --git a/resources/static/test/qunit/mocks/provisioning.js b/resources/static/test/mocks/provisioning.js
similarity index 100%
rename from resources/static/test/qunit/mocks/provisioning.js
rename to resources/static/test/mocks/provisioning.js
diff --git a/resources/static/test/qunit/mocks/templates.js b/resources/static/test/mocks/templates.js
similarity index 100%
rename from resources/static/test/qunit/mocks/templates.js
rename to resources/static/test/mocks/templates.js
diff --git a/resources/static/test/qunit/mocks/winchan.js b/resources/static/test/mocks/winchan.js
similarity index 100%
rename from resources/static/test/qunit/mocks/winchan.js
rename to resources/static/test/mocks/winchan.js
diff --git a/resources/static/test/qunit/mocks/window.js b/resources/static/test/mocks/window.js
similarity index 100%
rename from resources/static/test/qunit/mocks/window.js
rename to resources/static/test/mocks/window.js
diff --git a/resources/static/test/qunit/mocks/xhr.js b/resources/static/test/mocks/xhr.js
similarity index 100%
rename from resources/static/test/qunit/mocks/xhr.js
rename to resources/static/test/mocks/xhr.js
diff --git a/resources/static/test/qunit.css b/resources/static/test/qunit/qunit.css
similarity index 100%
rename from resources/static/test/qunit.css
rename to resources/static/test/qunit/qunit.css
diff --git a/resources/static/test/qunit.js b/resources/static/test/qunit/qunit.js
similarity index 100%
rename from resources/static/test/qunit.js
rename to resources/static/test/qunit/qunit.js
diff --git a/resources/static/test/qunit/testHelpers/helpers.js b/resources/static/test/testHelpers/helpers.js
similarity index 100%
rename from resources/static/test/qunit/testHelpers/helpers.js
rename to resources/static/test/testHelpers/helpers.js
diff --git a/resources/views/test.ejs b/resources/views/test.ejs
index 64619e6653c93db2750f042d72ed4684a071b489..2f59bbc5388d17e8863b3c64d6deaa5149c7a35c 100644
--- a/resources/views/test.ejs
+++ b/resources/views/test.ejs
@@ -6,7 +6,7 @@
 <html>
 	<head>
     <meta charset="utf-8">
-		<link rel="stylesheet" type="text/css" href="qunit.css" />
+		<link rel="stylesheet" type="text/css" href="qunit/qunit.css" />
 		<title>BrowserID QUnit Test</title>
   <!--[if lt IE 9]>
     <script src="/lib/html5shim.js"></script>
@@ -61,7 +61,7 @@
     <script type="text/html" id="templateUser">
       <li>{{email}}</li>
     </script>
-    <script src="qunit.js"></script>
+    <script src="qunit/qunit.js"></script>
     <script src="/include.js"></script>
     <script src="/lib/jquery-1.7.1.min.js"></script>
     <script src="/lib/underscore-min.js"></script>
@@ -76,12 +76,12 @@
     <script src="/lib/module.js"></script>
     <script src="/lib/jschannel.js"></script>
     <script src="/shared/javascript-extensions.js"></script>
-    <script src="qunit/mocks/mocks.js"></script>
-    <script src="qunit/mocks/xhr.js"></script>
-    <script src="qunit/mocks/templates.js"></script>
-    <script src="qunit/mocks/provisioning.js"></script>
-    <script src="qunit/mocks/window.js"></script>
-    <script src="qunit/mocks/winchan.js"></script>
+    <script src="mocks/mocks.js"></script>
+    <script src="mocks/xhr.js"></script>
+    <script src="mocks/templates.js"></script>
+    <script src="mocks/provisioning.js"></script>
+    <script src="mocks/window.js"></script>
+    <script src="mocks/winchan.js"></script>
 
     <script src="/shared/renderer.js"></script>
     <script src="/shared/class.js"></script>
@@ -131,54 +131,54 @@
     <script src="/pages/signup.js"></script>
     <script src="/pages/verify_email_address.js"></script>
 
-    <script src="qunit/testHelpers/helpers.js"></script>
-
-    <script src="qunit/include_unit_test.js"></script>
-
-    <script src="qunit/shared/helpers_unit_test.js"></script>
-    <script src="qunit/shared/renderer_unit_test.js"></script>
-    <script src="qunit/shared/screens_unit_test.js"></script>
-    <script src="qunit/shared/tooltip_unit_test.js"></script>
-    <script src="qunit/shared/error-display_unit_test.js"></script>
-    <script src="qunit/shared/browser-support_unit_test.js"></script>
-    <script src="qunit/shared/validation_unit_test.js"></script>
-    <script src="qunit/shared/storage_unit_test.js"></script>
-    <script src="qunit/shared/xhr_unit_test.js"></script>
-    <script src="qunit/shared/network_unit_test.js"></script>
-    <script src="qunit/shared/user_unit_test.js"></script>
-
-    <script src="qunit/shared/modules/page_module_unit_test.js"></script>
-    <script src="qunit/shared/modules/xhr_delay_unit_test.js"></script>
-    <script src="qunit/shared/modules/xhr_disable_form_unit_test.js"></script>
-    <script src="qunit/shared/modules/code_check_unit_test.js"></script>
-    <script src="qunit/shared/modules/cookie_check_unit_test.js"></script>
-
-    <script src="qunit/pages/browserid_unit_test.js"></script>
-    <script src="qunit/pages/page_helpers_unit_test.js"></script>
-    <script src="qunit/pages/add_email_address_test.js"></script>
-    <script src="qunit/pages/verify_email_address_test.js"></script>
-    <script src="qunit/pages/forgot_unit_test.js"></script>
-    <script src="qunit/pages/signin_unit_test.js"></script>
-    <script src="qunit/pages/signup_unit_test.js"></script>
-    <script src="qunit/pages/manage_account_unit_test.js"></script>
-
-    <script src="qunit/resources/internal_api_unit_test.js"></script>
-    <script src="qunit/resources/helpers_unit_test.js"></script>
-    <script src="qunit/resources/state_machine_unit_test.js"></script>
-
-    <script src="qunit/controllers/actions_unit_test.js"></script>
-    <script src="qunit/controllers/pick_email_unit_test.js"></script>
-    <script src="qunit/controllers/add_email_unit_test.js"></script>
-    <script src="qunit/controllers/check_registration_unit_test.js"></script>
-    <script src="qunit/controllers/authenticate_unit_test.js"></script>
-    <script src="qunit/controllers/forgot_password_unit_test.js"></script>
-    <script src="qunit/controllers/required_email_unit_test.js"></script>
-    <script src="qunit/controllers/verify_primary_user_unit_test.js"></script>
-    <script src="qunit/controllers/email_chosen_unit_test.js"></script>
-    <script src="qunit/controllers/provision_primary_user_unit_test.js"></script>
-    <script src="qunit/controllers/primary_user_provisioned_unit_test.js"></script>
+    <script src="testHelpers/helpers.js"></script>
+
+    <script src="cases/include.js"></script>
+
+    <script src="cases/shared/helpers.js"></script>
+    <script src="cases/shared/renderer.js"></script>
+    <script src="cases/shared/screens.js"></script>
+    <script src="cases/shared/tooltip.js"></script>
+    <script src="cases/shared/error-display.js"></script>
+    <script src="cases/shared/browser-support.js"></script>
+    <script src="cases/shared/validation.js"></script>
+    <script src="cases/shared/storage.js"></script>
+    <script src="cases/shared/xhr.js"></script>
+    <script src="cases/shared/network.js"></script>
+    <script src="cases/shared/user.js"></script>
+
+    <script src="cases/shared/modules/page_module.js"></script>
+    <script src="cases/shared/modules/xhr_delay.js"></script>
+    <script src="cases/shared/modules/xhr_disable_form.js"></script>
+    <script src="cases/shared/modules/code_check.js"></script>
+    <script src="cases/shared/modules/cookie_check.js"></script>
+
+    <script src="cases/pages/browserid.js"></script>
+    <script src="cases/pages/page_helpers.js"></script>
+    <script src="cases/pages/add_email_address_test.js"></script>
+    <script src="cases/pages/verify_email_address_test.js"></script>
+    <script src="cases/pages/forgot.js"></script>
+    <script src="cases/pages/signin.js"></script>
+    <script src="cases/pages/signup.js"></script>
+    <script src="cases/pages/manage_account.js"></script>
+
+    <script src="cases/resources/internal_api.js"></script>
+    <script src="cases/resources/helpers.js"></script>
+    <script src="cases/resources/state_machine.js"></script>
+
+    <script src="cases/controllers/actions.js"></script>
+    <script src="cases/controllers/pick_email.js"></script>
+    <script src="cases/controllers/add_email.js"></script>
+    <script src="cases/controllers/check_registration.js"></script>
+    <script src="cases/controllers/authenticate.js"></script>
+    <script src="cases/controllers/forgot_password.js"></script>
+    <script src="cases/controllers/required_email.js"></script>
+    <script src="cases/controllers/verify_primary_user.js"></script>
+    <script src="cases/controllers/email_chosen.js"></script>
+    <script src="cases/controllers/provision_primary_user.js"></script>
+    <script src="cases/controllers/primary_user_provisioned.js"></script>
 
     <!-- must go last or all other tests will fail. -->
-    <script src="qunit/controllers/dialog_unit_test.js"></script>
+    <script src="cases/controllers/dialog.js"></script>
 	</body>
 </html>