Move the tests outside the installed package

There's no need to install the test suite alongside the codebase. Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
fedora-infra · Jun 2, 2022 · 4b7bb51 · 4b7bb51
1 parent 0ac2023
commit 4b7bb51
Show file tree

Hide file tree

Showing 272 changed files with 33 additions and 32 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -14,5 +14,5 @@ exclude_lines =
     pragma: no cover
     if __name__ == .__main__.:
 omit =
-    noggin/tests/*
+    tests/*
     noggin/__init__.py
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,13 +29,13 @@ repos:
     hooks:
       - id: python-bandit-vulnerability-check
         alias: bandit
-        args: ["-r", "noggin/", "-x", "noggin/tests/", "-ll"]
+        args: ["-r", "noggin/", "-ll"]
   # - repo: local
   #   hooks:
   #     - id: bandit-local
   #       name: bandit
   #       entry: bandit
-  #       args: ["-r", "noggin/", "-x", "noggin/tests/", "-ll"]
+  #       args: ["-r", "noggin/", "-ll"]
   #       pass_filenames: false
   #       language: system
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -110,7 +110,6 @@ def run_apidoc(_):
             "-o",
             os.path.join(topdir, "docs", "_source"),
             os.path.join(topdir, "noggin"),
-            os.path.join(topdir, "noggin", "tests"),
         ]
     )
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -26,6 +26,7 @@ include = [
     { path = "babel.cfg", format = "sdist" },
     { path = "docs/*", format = "sdist" },
     { path = "docs/*/*", format = "sdist" },
+    { path = "tests/*", format = "sdist" },
 ]
 
 classifiers = [
@@ -186,7 +187,7 @@ force_alphabetical_sort_within_sections = true
 
 [tool.pytest.ini_options]
 testpaths = [
-    "noggin/tests/unit",
+    "tests/unit",
 ]
 
 [build-system]

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,10 +1,6 @@
-sonar-project.properties
 sonar.organization=fedora-infra
 sonar.projectKey=fedora-infra/noggin
 sonar.sources=noggin
 sonar.host.url=https://sonarcloud.io
-sonar.login=a36fe78f64abe3b8e6db0df06a6b399c2abc2e24
-sonar.test.exclusions=**/noggin/tests/*
+sonar.tests=tests
 sonar.exclusions=/devel/create-test-data.py, /noggin/themes/*/static/, /noggin/templates/*,
-
-
diff --git a/noggin/tests/__init__.py → tests/__init__.py b/noggin/tests/__init__.py → tests/__init__.py
diff --git a/noggin/tests/integration/__init__.py → tests/integration/__init__.py b/noggin/tests/integration/__init__.py → tests/integration/__init__.py
diff --git a/noggin/tests/integration/test_dummy.py → tests/integration/test_dummy.py b/noggin/tests/integration/test_dummy.py → tests/integration/test_dummy.py
diff --git a/noggin/tests/unit/__init__.py → tests/unit/__init__.py b/noggin/tests/unit/__init__.py → tests/unit/__init__.py
diff --git a/...ts/unit/cassettes/ipa_testing_config.yaml → tests/unit/cassettes/ipa_testing_config.yaml b/...ts/unit/cassettes/ipa_testing_config.yaml → tests/unit/cassettes/ipa_testing_config.yaml
diff --git a/...ttes/test_signals/test_signal_basset.yaml → ...ttes/test_signals/test_signal_basset.yaml b/...ttes/test_signals/test_signal_basset.yaml → ...ttes/test_signals/test_signal_basset.yaml
diff --git a/..._signals/test_signal_basset_disabled.yaml → ..._signals/test_signal_basset_disabled.yaml b/..._signals/test_signal_basset_disabled.yaml → ..._signals/test_signal_basset_disabled.yaml
diff --git a/...st_signals/test_signal_basset_failed.yaml → ...st_signals/test_signal_basset_failed.yaml b/...st_signals/test_signal_basset_failed.yaml → ...st_signals/test_signal_basset_failed.yaml
diff --git a/noggin/tests/unit/conftest.py → tests/unit/conftest.py b/noggin/tests/unit/conftest.py → tests/unit/conftest.py
diff --git a/noggin/tests/unit/controller/__init__.py → tests/unit/controller/__init__.py b/noggin/tests/unit/controller/__init__.py → tests/unit/controller/__init__.py
diff --git a/...ettes/test_authentication/test_login.yaml → ...ettes/test_authentication/test_login.yaml b/...ettes/test_authentication/test_login.yaml → ...ettes/test_authentication/test_login.yaml
diff --git a/...tication/test_login_expired_password.yaml → ...tication/test_login_expired_password.yaml b/...tication/test_login_expired_password.yaml → ...tication/test_login_expired_password.yaml
diff --git a/...cation/test_login_incorrect_password.yaml → ...cation/test_login_incorrect_password.yaml b/...cation/test_login_incorrect_password.yaml → ...cation/test_login_incorrect_password.yaml
diff --git a/...uthentication/test_login_no_password.yaml → ...uthentication/test_login_no_password.yaml b/...uthentication/test_login_no_password.yaml → ...uthentication/test_login_no_password.yaml
diff --git a/...hentication/test_login_username_case.yaml → ...hentication/test_login_username_case.yaml b/...hentication/test_login_username_case.yaml → ...hentication/test_login_username_case.yaml
diff --git a/...est_login_username_created_with_case.yaml → ...est_login_username_created_with_case.yaml b/...est_login_username_created_with_case.yaml → ...est_login_username_created_with_case.yaml
diff --git a/...ication/test_login_with_bad_redirect.yaml → ...ication/test_login_with_bad_redirect.yaml b/...ication/test_login_with_bad_redirect.yaml → ...ication/test_login_with_bad_redirect.yaml
diff --git a/...t_authentication/test_login_with_otp.yaml → ...t_authentication/test_login_with_otp.yaml b/...t_authentication/test_login_with_otp.yaml → ...t_authentication/test_login_with_otp.yaml
diff --git a/...hentication/test_login_with_redirect.yaml → ...hentication/test_login_with_redirect.yaml b/...hentication/test_login_with_redirect.yaml → ...hentication/test_login_with_redirect.yaml
diff --git a/...ttes/test_authentication/test_logout.yaml → ...ttes/test_authentication/test_logout.yaml b/...ttes/test_authentication/test_logout.yaml → ...ttes/test_authentication/test_logout.yaml
diff --git a/...hentication/test_otp_sync_http_error.yaml → ...hentication/test_otp_sync_http_error.yaml b/...hentication/test_otp_sync_http_error.yaml → ...hentication/test_otp_sync_http_error.yaml
diff --git a/...tication/test_otp_sync_invalid_codes.yaml → ...tication/test_otp_sync_invalid_codes.yaml b/...tication/test_otp_sync_invalid_codes.yaml → ...tication/test_otp_sync_invalid_codes.yaml
diff --git a/...entication/test_otp_sync_no_username.yaml → ...entication/test_otp_sync_no_username.yaml b/...entication/test_otp_sync_no_username.yaml → ...entication/test_otp_sync_no_username.yaml
diff --git a/...uthentication/test_otp_sync_rejected.yaml → ...uthentication/test_otp_sync_rejected.yaml b/...uthentication/test_otp_sync_rejected.yaml → ...uthentication/test_otp_sync_rejected.yaml
diff --git a/...authentication/test_otp_sync_success.yaml → ...authentication/test_otp_sync_success.yaml b/...authentication/test_otp_sync_success.yaml → ...authentication/test_otp_sync_success.yaml
diff --git a/...est_forgot_password/test_ask_no_smtp.yaml → ...est_forgot_password/test_ask_no_smtp.yaml b/...est_forgot_password/test_ask_no_smtp.yaml → ...est_forgot_password/test_ask_no_smtp.yaml
diff --git a/...s/test_forgot_password/test_ask_post.yaml → ...s/test_forgot_password/test_ask_post.yaml b/...s/test_forgot_password/test_ask_post.yaml → ...s/test_forgot_password/test_ask_post.yaml
diff --git a/...password/test_ask_post_mix_case_user.yaml → ...password/test_ask_post_mix_case_user.yaml b/...password/test_ask_post_mix_case_user.yaml → ...password/test_ask_post_mix_case_user.yaml
diff --git a/...est_ask_post_no_last_password_change.yaml → ...est_ask_post_no_last_password_change.yaml b/...est_ask_post_no_last_password_change.yaml → ...est_ask_post_no_last_password_change.yaml
diff --git a/...word/test_ask_post_non_existant_user.yaml → ...word/test_ask_post_non_existant_user.yaml b/...word/test_ask_post_non_existant_user.yaml → ...word/test_ask_post_non_existant_user.yaml
diff --git a/...test_forgot_password/test_change_get.yaml → ...test_forgot_password/test_change_get.yaml b/...test_forgot_password/test_change_get.yaml → ...test_forgot_password/test_change_get.yaml
diff --git a/...rgot_password/test_change_not_active.yaml → ...rgot_password/test_change_not_active.yaml b/...rgot_password/test_change_not_active.yaml → ...rgot_password/test_change_not_active.yaml
diff --git a/...est_forgot_password/test_change_post.yaml → ...est_forgot_password/test_change_post.yaml b/...est_forgot_password/test_change_post.yaml → ...est_forgot_password/test_change_post.yaml
diff --git a/...sword/test_change_post_generic_error.yaml → ...sword/test_change_post_generic_error.yaml b/...sword/test_change_post_generic_error.yaml → ...sword/test_change_post_generic_error.yaml
diff --git a/...ange_post_no_earlier_password_change.yaml → ...ange_post_no_earlier_password_change.yaml b/...ange_post_no_earlier_password_change.yaml → ...ange_post_no_earlier_password_change.yaml
diff --git a/...change_post_password_policy_rejected.yaml → ...change_post_password_policy_rejected.yaml b/...change_post_password_policy_rejected.yaml → ...change_post_password_policy_rejected.yaml
diff --git a/.../test_change_post_password_too_short.yaml → .../test_change_post_password_too_short.yaml b/.../test_change_post_password_too_short.yaml → .../test_change_post_password_too_short.yaml
diff --git a/...nge_post_password_with_otp_not_given.yaml → ...nge_post_password_with_otp_not_given.yaml b/...nge_post_password_with_otp_not_given.yaml → ...nge_post_password_with_otp_not_given.yaml
diff --git a/...e_post_password_with_otp_wrong_value.yaml → ...e_post_password_with_otp_wrong_value.yaml b/...e_post_password_with_otp_wrong_value.yaml → ...e_post_password_with_otp_wrong_value.yaml
diff --git a/...t_password/test_change_post_with_otp.yaml → ...t_password/test_change_post_with_otp.yaml b/...t_password/test_change_post_with_otp.yaml → ...t_password/test_change_post_with_otp.yaml
diff --git a/...d/test_change_recent_password_change.yaml → ...d/test_change_recent_password_change.yaml b/...d/test_change_recent_password_change.yaml → ...d/test_change_recent_password_change.yaml
diff --git a/..._forgot_password/test_change_too_old.yaml → ..._forgot_password/test_change_too_old.yaml b/..._forgot_password/test_change_too_old.yaml → ..._forgot_password/test_change_too_old.yaml
diff --git a/...ller/cassettes/test_group/test_group.yaml → ...ller/cassettes/test_group/test_group.yaml b/...ller/cassettes/test_group/test_group.yaml → ...ller/cassettes/test_group/test_group.yaml
diff --git a/...tes/test_group/test_group_add_member.yaml → ...tes/test_group/test_group_add_member.yaml b/...tes/test_group/test_group_add_member.yaml → ...tes/test_group/test_group_add_member.yaml
diff --git a/...roup/test_group_add_member_forbidden.yaml → ...roup/test_group_add_member_forbidden.yaml b/...roup/test_group_add_member_forbidden.yaml → ...roup/test_group_add_member_forbidden.yaml
diff --git a/...p/test_group_add_member_hidden_group.yaml → ...p/test_group_add_member_hidden_group.yaml b/...p/test_group_add_member_hidden_group.yaml → ...p/test_group_add_member_hidden_group.yaml
diff --git a/..._group/test_group_add_member_invalid.yaml → ..._group/test_group_add_member_invalid.yaml b/..._group/test_group_add_member_invalid.yaml → ..._group/test_group_add_member_invalid.yaml
diff --git a/...p/test_group_add_member_invalid_form.yaml → ...p/test_group_add_member_invalid_form.yaml b/...p/test_group_add_member_invalid_form.yaml → ...p/test_group_add_member_invalid_form.yaml
diff --git a/..._group/test_group_add_unknown_member.yaml → ..._group/test_group_add_unknown_member.yaml b/..._group/test_group_add_unknown_member.yaml → ..._group/test_group_add_unknown_member.yaml
diff --git a/...test_group/test_group_does_not_exist.yaml → ...test_group/test_group_does_not_exist.yaml b/...test_group/test_group_does_not_exist.yaml → ...test_group/test_group_does_not_exist.yaml
diff --git a/...ssettes/test_group/test_group_hidden.yaml → ...ssettes/test_group/test_group_hidden.yaml b/...ssettes/test_group/test_group_hidden.yaml → ...ssettes/test_group/test_group_hidden.yaml
diff --git a/...s/test_group/test_group_many_members.yaml → ...s/test_group/test_group_many_members.yaml b/...s/test_group/test_group_many_members.yaml → ...s/test_group/test_group_many_members.yaml
diff --git a/.../test_group/test_group_remove_member.yaml → .../test_group/test_group_remove_member.yaml b/.../test_group/test_group_remove_member.yaml → .../test_group/test_group_remove_member.yaml
diff --git a/...est_group_remove_member_hidden_group.yaml → ...est_group_remove_member_hidden_group.yaml b/...est_group_remove_member_hidden_group.yaml → ...est_group_remove_member_hidden_group.yaml
diff --git a/...oup/test_group_remove_member_invalid.yaml → ...oup/test_group_remove_member_invalid.yaml b/...oup/test_group_remove_member_invalid.yaml → ...oup/test_group_remove_member_invalid.yaml
diff --git a/...est_group_remove_member_invalid_form.yaml → ...est_group_remove_member_invalid_form.yaml b/...est_group_remove_member_invalid_form.yaml → ...est_group_remove_member_invalid_form.yaml
diff --git a/...oup/test_group_remove_member_unknown.yaml → ...oup/test_group_remove_member_unknown.yaml b/...oup/test_group_remove_member_unknown.yaml → ...oup/test_group_remove_member_unknown.yaml
diff --git a/...es/test_group/test_group_remove_self.yaml → ...es/test_group/test_group_remove_self.yaml b/...es/test_group/test_group_remove_self.yaml → ...es/test_group/test_group_remove_self.yaml
diff --git a/...test_group/test_group_remove_sponsor.yaml → ...test_group/test_group_remove_sponsor.yaml b/...test_group/test_group_remove_sponsor.yaml → ...test_group/test_group_remove_sponsor.yaml
diff --git a/...group/test_group_remove_sponsor_last.yaml → ...group/test_group_remove_sponsor_last.yaml b/...group/test_group_remove_sponsor_last.yaml → ...group/test_group_remove_sponsor_last.yaml
diff --git a/...up/test_group_remove_sponsor_unknown.yaml → ...up/test_group_remove_sponsor_unknown.yaml b/...up/test_group_remove_sponsor_unknown.yaml → ...up/test_group_remove_sponsor_unknown.yaml
diff --git a/...assettes/test_group/test_groups_list.yaml → ...assettes/test_group/test_groups_list.yaml b/...assettes/test_group/test_groups_list.yaml → ...assettes/test_group/test_groups_list.yaml
diff --git a/...est_group/test_groups_list_no_hidden.yaml → ...est_group/test_groups_list_no_hidden.yaml b/...est_group/test_groups_list_no_hidden.yaml → ...est_group/test_groups_list_no_hidden.yaml
diff --git a/...set/test_non_matching_passwords_user.yaml → ...set/test_non_matching_passwords_user.yaml b/...set/test_non_matching_passwords_user.yaml → ...set/test_non_matching_passwords_user.yaml
diff --git a/...es/test_password_reset/test_password.yaml → ...es/test_password_reset/test_password.yaml b/...es/test_password_reset/test_password.yaml → ...es/test_password_reset/test_password.yaml
diff --git a/...password_reset/test_password_changes.yaml → ...password_reset/test_password_changes.yaml b/...password_reset/test_password_changes.yaml → ...password_reset/test_password_changes.yaml
diff --git a/...ord_reset/test_password_changes_user.yaml → ...ord_reset/test_password_changes_user.yaml b/...ord_reset/test_password_changes_user.yaml → ...ord_reset/test_password_changes_user.yaml
diff --git a/...set/test_password_changes_wrong_user.yaml → ...set/test_password_changes_wrong_user.yaml b/...set/test_password_changes_wrong_user.yaml → ...set/test_password_changes_wrong_user.yaml
diff --git a/...rd_reset/test_password_form_with_otp.yaml → ...rd_reset/test_password_form_with_otp.yaml b/...rd_reset/test_password_form_with_otp.yaml → ...rd_reset/test_password_form_with_otp.yaml
diff --git a/...reset/test_password_form_without_otp.yaml → ...reset/test_password_form_without_otp.yaml b/...reset/test_password_form_without_otp.yaml → ...reset/test_password_form_without_otp.yaml
diff --git a/...password_reset/test_password_no_user.yaml → ...password_reset/test_password_no_user.yaml b/...password_reset/test_password_no_user.yaml → ...password_reset/test_password_no_user.yaml
diff --git a/...sword_reset/test_password_reset_user.yaml → ...sword_reset/test_password_reset_user.yaml b/...sword_reset/test_password_reset_user.yaml → ...sword_reset/test_password_reset_user.yaml
diff --git a/...st_password_reset/test_password_user.yaml → ...st_password_reset/test_password_user.yaml b/...st_password_reset/test_password_user.yaml → ...st_password_reset/test_password_user.yaml
diff --git a/...sword_reset/test_short_password_form.yaml → ...sword_reset/test_short_password_form.yaml b/...sword_reset/test_short_password_form.yaml → ...sword_reset/test_short_password_form.yaml
diff --git a/...ord_reset/test_short_password_policy.yaml → ...ord_reset/test_short_password_policy.yaml b/...ord_reset/test_short_password_policy.yaml → ...ord_reset/test_short_password_policy.yaml
diff --git a/.../test_time_sensitive_password_policy.yaml → .../test_time_sensitive_password_policy.yaml b/.../test_time_sensitive_password_policy.yaml → .../test_time_sensitive_password_policy.yaml
diff --git a/...tes/test_registration/test_duplicate.yaml → ...tes/test_registration/test_duplicate.yaml b/...tes/test_registration/test_duplicate.yaml → ...tes/test_registration/test_duplicate.yaml
diff --git a/...registration/test_field_error_step_3.yaml → ...registration/test_field_error_step_3.yaml b/...registration/test_field_error_step_3.yaml → ...registration/test_field_error_step_3.yaml
diff --git a/...ssettes/test_registration/test_gecos.yaml → ...ssettes/test_registration/test_gecos.yaml b/...ssettes/test_registration/test_gecos.yaml → ...ssettes/test_registration/test_gecos.yaml
diff --git a/...stration/test_generic_activate_error.yaml → ...stration/test_generic_activate_error.yaml b/...stration/test_generic_activate_error.yaml → ...stration/test_generic_activate_error.yaml
diff --git a/...stration/test_generic_pwchange_error.yaml → ...stration/test_generic_pwchange_error.yaml b/...stration/test_generic_pwchange_error.yaml → ...stration/test_generic_pwchange_error.yaml
diff --git a/...st_registration/test_lowercase_email.yaml → ...st_registration/test_lowercase_email.yaml b/...st_registration/test_lowercase_email.yaml → ...st_registration/test_lowercase_email.yaml
diff --git a/...st_registration/test_no_direct_login.yaml → ...st_registration/test_no_direct_login.yaml b/...st_registration/test_no_direct_login.yaml → ...st_registration/test_no_direct_login.yaml
diff --git a/...s/test_registration/test_registering.yaml → ...s/test_registration/test_registering.yaml b/...s/test_registration/test_registering.yaml → ...s/test_registration/test_registering.yaml
diff --git a/...ive-Accepted registering user dummy].yaml → ...ive-Accepted registering user dummy].yaml b/...ive-Accepted registering user dummy].yaml → ...ive-Accepted registering user dummy].yaml
diff --git a/...gged registering user dummy as spam].yaml → ...gged registering user dummy as spam].yaml b/...gged registering user dummy as spam].yaml → ...gged registering user dummy as spam].yaml
diff --git a/...d not accept registering user dummy].yaml → ...d not accept registering user dummy].yaml b/...d not accept registering user dummy].yaml → ...d not accept registering user dummy].yaml
diff --git a/...flag registering user dummy as spam].yaml → ...flag registering user dummy as spam].yaml b/...flag registering user dummy as spam].yaml → ...flag registering user dummy as spam].yaml
diff --git a/...registration/test_registering_delete.yaml → ...registration/test_registering_delete.yaml b/...registration/test_registering_delete.yaml → ...registration/test_registering_delete.yaml
diff --git a/...ration/test_registering_delete_error.yaml → ...ration/test_registering_delete_error.yaml b/...ration/test_registering_delete_error.yaml → ...ration/test_registering_delete_error.yaml
diff --git a/...tion/test_registering_invalid_action.yaml → ...tion/test_registering_invalid_action.yaml b/...tion/test_registering_invalid_action.yaml → ...tion/test_registering_invalid_action.yaml
diff --git a/...ration/test_registering_unknown_user.yaml → ...ration/test_registering_unknown_user.yaml b/...ration/test_registering_unknown_user.yaml → ...ration/test_registering_unknown_user.yaml
diff --git a/...egistration/test_short_password_form.yaml → ...egistration/test_short_password_form.yaml b/...egistration/test_short_password_form.yaml → ...egistration/test_short_password_form.yaml
diff --git a/...istration/test_short_password_policy.yaml → ...istration/test_short_password_policy.yaml b/...istration/test_short_password_policy.yaml → ...istration/test_short_password_policy.yaml
diff --git a/..._registration/test_spamcheck[active].yaml → ..._registration/test_spamcheck[active].yaml b/..._registration/test_spamcheck[active].yaml → ..._registration/test_spamcheck[active].yaml
diff --git a/...ion/test_spamcheck[spamcheck_denied].yaml → ...ion/test_spamcheck[spamcheck_denied].yaml b/...ion/test_spamcheck[spamcheck_denied].yaml → ...ion/test_spamcheck[spamcheck_denied].yaml
diff --git a/...ion/test_spamcheck[spamcheck_manual].yaml → ...ion/test_spamcheck[spamcheck_manual].yaml b/...ion/test_spamcheck[spamcheck_manual].yaml → ...ion/test_spamcheck[spamcheck_manual].yaml
diff --git a/..._spamcheck_bad_missing_key[payload0].yaml → ..._spamcheck_bad_missing_key[payload0].yaml b/..._spamcheck_bad_missing_key[payload0].yaml → ..._spamcheck_bad_missing_key[payload0].yaml
diff --git a/..._spamcheck_bad_missing_key[payload1].yaml → ..._spamcheck_bad_missing_key[payload1].yaml b/..._spamcheck_bad_missing_key[payload1].yaml → ..._spamcheck_bad_missing_key[payload1].yaml
diff --git a/...istration/test_spamcheck_bad_payload.yaml → ...istration/test_spamcheck_bad_payload.yaml b/...istration/test_spamcheck_bad_payload.yaml → ...istration/test_spamcheck_bad_payload.yaml
diff --git a/...registration/test_spamcheck_disabled.yaml → ...registration/test_spamcheck_disabled.yaml b/...registration/test_spamcheck_disabled.yaml → ...registration/test_spamcheck_disabled.yaml
diff --git a/...tration/test_spamcheck_expired_token.yaml → ...tration/test_spamcheck_expired_token.yaml b/...tration/test_spamcheck_expired_token.yaml → ...tration/test_spamcheck_expired_token.yaml
diff --git a/...tration/test_spamcheck_invalid_token.yaml → ...tration/test_spamcheck_invalid_token.yaml b/...tration/test_spamcheck_invalid_token.yaml → ...tration/test_spamcheck_invalid_token.yaml
diff --git a/...t_spamcheck_wait[spamcheck_awaiting].yaml → ...t_spamcheck_wait[spamcheck_awaiting].yaml b/...t_spamcheck_wait[spamcheck_awaiting].yaml → ...t_spamcheck_wait[spamcheck_awaiting].yaml
diff --git a/...est_spamcheck_wait[spamcheck_denied].yaml → ...est_spamcheck_wait[spamcheck_denied].yaml b/...est_spamcheck_wait[spamcheck_denied].yaml → ...est_spamcheck_wait[spamcheck_denied].yaml
diff --git a/...est_spamcheck_wait[spamcheck_manual].yaml → ...est_spamcheck_wait[spamcheck_manual].yaml b/...est_spamcheck_wait[spamcheck_manual].yaml → ...est_spamcheck_wait[spamcheck_manual].yaml
diff --git a/...istration/test_spamcheck_wait_active.yaml → ...istration/test_spamcheck_wait_active.yaml b/...istration/test_spamcheck_wait_active.yaml → ...istration/test_spamcheck_wait_active.yaml
diff --git a/...ion/test_spamcheck_wait_bad_username.yaml → ...ion/test_spamcheck_wait_bad_username.yaml b/...ion/test_spamcheck_wait_bad_username.yaml → ...ion/test_spamcheck_wait_bad_username.yaml
diff --git a/...tion/test_spamcheck_wait_no_username.yaml → ...tion/test_spamcheck_wait_no_username.yaml b/...tion/test_spamcheck_wait_no_username.yaml → ...tion/test_spamcheck_wait_no_username.yaml
diff --git a/...stration/test_spamcheck_wrong_status.yaml → ...stration/test_spamcheck_wrong_status.yaml b/...stration/test_spamcheck_wrong_status.yaml → ...stration/test_spamcheck_wrong_status.yaml
diff --git a/...settes/test_registration/test_step_1.yaml → ...settes/test_registration/test_step_1.yaml b/...settes/test_registration/test_step_1.yaml → ...settes/test_registration/test_step_1.yaml
diff --git a/...est_registration/test_step_1_no_smtp.yaml → ...est_registration/test_step_1_no_smtp.yaml b/...est_registration/test_step_1_no_smtp.yaml → ...est_registration/test_step_1_no_smtp.yaml
diff --git a/...tion/test_step_1_registration_closed.yaml → ...tion/test_step_1_registration_closed.yaml b/...tion/test_step_1_registration_closed.yaml → ...tion/test_step_1_registration_closed.yaml
diff --git a/...t_registration/test_step_1_spamcheck.yaml → ...t_registration/test_step_1_spamcheck.yaml b/...t_registration/test_step_1_spamcheck.yaml → ...t_registration/test_step_1_spamcheck.yaml
diff --git a/...settes/test_registration/test_step_2.yaml → ...settes/test_registration/test_step_2.yaml b/...settes/test_registration/test_step_2.yaml → ...settes/test_registration/test_step_2.yaml
diff --git a/...test_registration/test_step_2_resend.yaml → ...test_registration/test_step_2_resend.yaml b/...test_registration/test_step_2_resend.yaml → ...test_registration/test_step_2_resend.yaml
diff --git a/...ration/test_step_2_spamchecking_user.yaml → ...ration/test_step_2_spamchecking_user.yaml b/...ration/test_step_2_spamchecking_user.yaml → ...ration/test_step_2_spamchecking_user.yaml
diff --git a/...egistration/test_step_2_unknown_user.yaml → ...egistration/test_step_2_unknown_user.yaml b/...egistration/test_step_2_unknown_user.yaml → ...egistration/test_step_2_unknown_user.yaml
diff --git a/...settes/test_registration/test_step_3.yaml → ...settes/test_registration/test_step_3.yaml b/...settes/test_registration/test_step_3.yaml → ...settes/test_registration/test_step_3.yaml
diff --git a/...gistration/test_step_3_garbled_token.yaml → ...gistration/test_step_3_garbled_token.yaml b/...gistration/test_step_3_garbled_token.yaml → ...gistration/test_step_3_garbled_token.yaml
diff --git a/...gistration/test_step_3_invalid_token.yaml → ...gistration/test_step_3_invalid_token.yaml b/...gistration/test_step_3_invalid_token.yaml → ...gistration/test_step_3_invalid_token.yaml
diff --git a/...st_registration/test_step_3_no_token.yaml → ...st_registration/test_step_3_no_token.yaml b/...st_registration/test_step_3_no_token.yaml → ...st_registration/test_step_3_no_token.yaml
diff --git a/...egistration/test_step_3_unknown_user.yaml → ...egistration/test_step_3_unknown_user.yaml b/...egistration/test_step_3_unknown_user.yaml → ...egistration/test_step_3_unknown_user.yaml
diff --git a/...gistration/test_step_3_wrong_address.yaml → ...gistration/test_step_3_wrong_address.yaml b/...gistration/test_step_3_wrong_address.yaml → ...gistration/test_step_3_wrong_address.yaml
diff --git a/...t_registration/test_strip[firstname].yaml → ...t_registration/test_strip[firstname].yaml b/...t_registration/test_strip[firstname].yaml → ...t_registration/test_strip[firstname].yaml
diff --git a/...st_registration/test_strip[lastname].yaml → ...st_registration/test_strip[lastname].yaml b/...st_registration/test_strip[lastname].yaml → ...st_registration/test_strip[lastname].yaml
diff --git a/...ttes/test_root/test_healthz_no_https.yaml → ...ttes/test_root/test_healthz_no_https.yaml b/...ttes/test_root/test_healthz_no_https.yaml → ...ttes/test_root/test_healthz_no_https.yaml
diff --git a/.../test_root/test_healthz_readiness_ok.yaml → .../test_root/test_healthz_readiness_ok.yaml b/.../test_root/test_healthz_readiness_ok.yaml → .../test_root/test_healthz_readiness_ok.yaml
diff --git a/...es/test_root/test_root_authenticated.yaml → ...es/test_root/test_root_authenticated.yaml b/...es/test_root/test_root_authenticated.yaml → ...es/test_root/test_root_authenticated.yaml
diff --git a/...cassettes/test_root/test_search_json.yaml → ...cassettes/test_root/test_search_json.yaml b/...cassettes/test_root/test_search_json.yaml → ...cassettes/test_root/test_search_json.yaml
diff --git a/...tes/test_root/test_search_json_empty.yaml → ...tes/test_root/test_search_json_empty.yaml b/...tes/test_root/test_search_json_empty.yaml → ...tes/test_root/test_search_json_empty.yaml
diff --git a/...t_root/test_search_json_group_nonfas.yaml → ...t_root/test_search_json_group_nonfas.yaml b/...t_root/test_search_json_group_nonfas.yaml → ...t_root/test_search_json_group_nonfas.yaml
diff --git a/...st_root/test_search_json_user_nonfas.yaml → ...st_root/test_search_json_user_nonfas.yaml b/...st_root/test_search_json_user_nonfas.yaml → ...st_root/test_search_json_user_nonfas.yaml
diff --git a/...roller/cassettes/test_user/test_user.yaml → ...roller/cassettes/test_user/test_user.yaml b/...roller/cassettes/test_user/test_user.yaml → ...roller/cassettes/test_user/test_user.yaml
diff --git a/...t_user/test_user_can_see_dummy_group.yaml → ...t_user/test_user_can_see_dummy_group.yaml b/...t_user/test_user_can_see_dummy_group.yaml → ...t_user/test_user_can_see_dummy_group.yaml
diff --git a/...ser/test_user_cant_see_hidden_groups.yaml → ...ser/test_user_cant_see_hidden_groups.yaml b/...ser/test_user_cant_see_hidden_groups.yaml → ...ser/test_user_cant_see_hidden_groups.yaml
diff --git a/...r/cassettes/test_user/test_user_edit.yaml → ...r/cassettes/test_user/test_user_edit.yaml b/...r/cassettes/test_user/test_user_edit.yaml → ...r/cassettes/test_user/test_user_edit.yaml
diff --git a/...er/test_user_edit_no_permission[GET].yaml → ...er/test_user_edit_no_permission[GET].yaml b/...er/test_user_edit_no_permission[GET].yaml → ...er/test_user_edit_no_permission[GET].yaml
diff --git a/...r/test_user_edit_no_permission[POST].yaml → ...r/test_user_edit_no_permission[POST].yaml b/...r/test_user_edit_no_permission[POST].yaml → ...r/test_user_edit_no_permission[POST].yaml
diff --git a/...settes/test_user/test_user_edit_post.yaml → ...settes/test_user/test_user_edit_post.yaml b/...settes/test_user/test_user_edit_post.yaml → ...settes/test_user/test_user_edit_post.yaml
diff --git a/...user/test_user_edit_post_bad_request.yaml → ...user/test_user_edit_post_bad_request.yaml b/...user/test_user_edit_post_bad_request.yaml → ...user/test_user_edit_post_bad_request.yaml
diff --git a/.../test_user/test_user_edit_post_gecos.yaml → .../test_user/test_user_edit_post_gecos.yaml b/.../test_user/test_user_edit_post_gecos.yaml → .../test_user/test_user_edit_post_gecos.yaml
diff --git a/...r/test_user_edit_post_minimal_values.yaml → ...r/test_user_edit_post_minimal_values.yaml b/...r/test_user_edit_post_minimal_values.yaml → ...r/test_user_edit_post_minimal_values.yaml
diff --git a/...t_user/test_user_edit_post_no_change.yaml → ...t_user/test_user_edit_post_no_change.yaml b/...t_user/test_user_edit_post_no_change.yaml → ...t_user/test_user_edit_post_no_change.yaml
diff --git a/...assettes/test_user/test_user_private.yaml → ...assettes/test_user/test_user_private.yaml b/...assettes/test_user/test_user_private.yaml → ...assettes/test_user/test_user_private.yaml
diff --git a/...t_user/test_user_settings_agreements.yaml → ...t_user/test_user_settings_agreements.yaml b/...t_user/test_user_settings_agreements.yaml → ...t_user/test_user_settings_agreements.yaml
diff --git a/...st_user_settings_agreements_disabled.yaml → ...st_user_settings_agreements_disabled.yaml b/...st_user_settings_agreements_disabled.yaml → ...st_user_settings_agreements_disabled.yaml
diff --git a/...r/test_user_settings_agreements_post.yaml → ...r/test_user_settings_agreements_post.yaml b/...r/test_user_settings_agreements_post.yaml → ...r/test_user_settings_agreements_post.yaml
diff --git a/...settings_agreements_post_bad_request.yaml → ...settings_agreements_post_bad_request.yaml b/...settings_agreements_post_bad_request.yaml → ...settings_agreements_post_bad_request.yaml
diff --git a/...ser_settings_agreements_post_unknown.yaml → ...ser_settings_agreements_post_unknown.yaml b/...ser_settings_agreements_post_unknown.yaml → ...ser_settings_agreements_post_unknown.yaml
diff --git a/...s/test_user/test_user_settings_email.yaml → ...s/test_user/test_user_settings_email.yaml b/...s/test_user/test_user_settings_email.yaml → ...s/test_user/test_user_settings_email.yaml
diff --git a/...r/test_user_settings_email_no_change.yaml → ...r/test_user_settings_email_no_change.yaml b/...r/test_user_settings_email_no_change.yaml → ...r/test_user_settings_email_no_change.yaml
diff --git a/...t_user/test_user_settings_email_post.yaml → ...t_user/test_user_settings_email_post.yaml b/...t_user/test_user_settings_email_post.yaml → ...t_user/test_user_settings_email_post.yaml
diff --git a/...st_user_settings_email_post_multiple.yaml → ...st_user_settings_email_post_multiple.yaml b/...st_user_settings_email_post_multiple.yaml → ...st_user_settings_email_post_multiple.yaml
diff --git a/...est_user_settings_email_post_no_smtp.yaml → ...est_user_settings_email_post_no_smtp.yaml b/...est_user_settings_email_post_no_smtp.yaml → ...est_user_settings_email_post_no_smtp.yaml
diff --git a/...ser/test_user_settings_email_removal.yaml → ...ser/test_user_settings_email_removal.yaml b/...ser/test_user_settings_email_removal.yaml → ...ser/test_user_settings_email_removal.yaml
diff --git a/.../test_user_settings_email_validation.yaml → .../test_user_settings_email_validation.yaml b/.../test_user_settings_email_validation.yaml → .../test_user_settings_email_validation.yaml
diff --git a/..._settings_email_validation_bad_token.yaml → ..._settings_email_validation_bad_token.yaml b/..._settings_email_validation_bad_token.yaml → ..._settings_email_validation_bad_token.yaml
diff --git a/...tings_email_validation_expired_token.yaml → ...tings_email_validation_expired_token.yaml b/...tings_email_validation_expired_token.yaml → ...tings_email_validation_expired_token.yaml
diff --git a/...r_settings_email_validation_no_token.yaml → ...r_settings_email_validation_no_token.yaml b/...r_settings_email_validation_no_token.yaml → ...r_settings_email_validation_no_token.yaml
diff --git a/...settings_email_validation_other_user.yaml → ...settings_email_validation_other_user.yaml b/...settings_email_validation_other_user.yaml → ...settings_email_validation_other_user.yaml
diff --git a/..._user_settings_email_validation_post.yaml → ..._user_settings_email_validation_post.yaml b/..._user_settings_email_validation_post.yaml → ..._user_settings_email_validation_post.yaml
diff --git a/...ttings_email_validation_post_failure.yaml → ...ttings_email_validation_post_failure.yaml b/...ttings_email_validation_post_failure.yaml → ...ttings_email_validation_post_failure.yaml
diff --git a/...es/test_user/test_user_settings_keys.yaml → ...es/test_user/test_user_settings_keys.yaml b/...es/test_user/test_user_settings_keys.yaml → ...es/test_user/test_user_settings_keys.yaml
diff --git a/...ser_settings_keys_no_permission[GET].yaml → ...ser_settings_keys_no_permission[GET].yaml b/...ser_settings_keys_no_permission[GET].yaml → ...ser_settings_keys_no_permission[GET].yaml
diff --git a/...er_settings_keys_no_permission[POST].yaml → ...er_settings_keys_no_permission[POST].yaml b/...er_settings_keys_no_permission[POST].yaml → ...er_settings_keys_no_permission[POST].yaml
diff --git a/...st_user/test_user_settings_keys_post.yaml → ...st_user/test_user_settings_keys_post.yaml b/...st_user/test_user_settings_keys_post.yaml → ...st_user/test_user_settings_keys_post.yaml
diff --git a/..._user_settings_keys_post_bad_request.yaml → ..._user_settings_keys_post_bad_request.yaml b/..._user_settings_keys_post_bad_request.yaml → ..._user_settings_keys_post_bad_request.yaml
diff --git a/...st_user_settings_keys_post_no_change.yaml → ...st_user_settings_keys_post_no_change.yaml b/...st_user_settings_keys_post_no_change.yaml → ...st_user_settings_keys_post_no_change.yaml
diff --git a/...t_user_settings_keys_post_whitespace.yaml → ...t_user_settings_keys_post_whitespace.yaml b/...t_user_settings_keys_post_whitespace.yaml → ...t_user_settings_keys_post_whitespace.yaml
diff --git a/..._user/test_user_with_indirect_groups.yaml → ..._user/test_user_with_indirect_groups.yaml b/..._user/test_user_with_indirect_groups.yaml → ..._user/test_user_with_indirect_groups.yaml
diff --git a/...s/test_user/test_user_with_no_groups.yaml → ...s/test_user/test_user_with_no_groups.yaml b/...s/test_user/test_user_with_no_groups.yaml → ...s/test_user/test_user_with_no_groups.yaml
diff --git a/...test_user_otp/test_user_settings_otp.yaml → ...test_user_otp/test_user_settings_otp.yaml b/...test_user_otp/test_user_settings_otp.yaml → ...test_user_otp/test_user_settings_otp.yaml
diff --git a/..._user_otp/test_user_settings_otp_add.yaml → ..._user_otp/test_user_settings_otp_add.yaml b/..._user_otp/test_user_settings_otp_add.yaml → ..._user_otp/test_user_settings_otp_add.yaml
diff --git a/...p/test_user_settings_otp_add_invalid.yaml → ...p/test_user_settings_otp_add_invalid.yaml b/...p/test_user_settings_otp_add_invalid.yaml → ...p/test_user_settings_otp_add_invalid.yaml
diff --git a/...t_user_settings_otp_add_invalid_form.yaml → ...t_user_settings_otp_add_invalid_form.yaml b/...t_user_settings_otp_add_invalid_form.yaml → ...t_user_settings_otp_add_invalid_form.yaml
diff --git a/..._user_settings_otp_add_no_permission.yaml → ..._user_settings_otp_add_no_permission.yaml b/..._user_settings_otp_add_no_permission.yaml → ..._user_settings_otp_add_no_permission.yaml
diff --git a/...tp/test_user_settings_otp_add_second.yaml → ...tp/test_user_settings_otp_add_second.yaml b/...tp/test_user_settings_otp_add_second.yaml → ...tp/test_user_settings_otp_add_second.yaml
diff --git a/...user_settings_otp_add_second_confirm.yaml → ...user_settings_otp_add_second_confirm.yaml b/...user_settings_otp_add_second_confirm.yaml → ...user_settings_otp_add_second_confirm.yaml
diff --git a/...est_user_settings_otp_add_wrong_code.yaml → ...est_user_settings_otp_add_wrong_code.yaml b/...est_user_settings_otp_add_wrong_code.yaml → ...est_user_settings_otp_add_wrong_code.yaml
diff --git a/...user_settings_otp_add_wrong_password.yaml → ...user_settings_otp_add_wrong_password.yaml b/...user_settings_otp_add_wrong_password.yaml → ...user_settings_otp_add_wrong_password.yaml
diff --git a/...tings_otp_check_description_escaping.yaml → ...tings_otp_check_description_escaping.yaml b/...tings_otp_check_description_escaping.yaml → ...tings_otp_check_description_escaping.yaml
diff --git a/...er_settings_otp_check_no_description.yaml → ...er_settings_otp_check_no_description.yaml b/...er_settings_otp_check_no_description.yaml → ...er_settings_otp_check_no_description.yaml
diff --git a/...r_otp/test_user_settings_otp_confirm.yaml → ...r_otp/test_user_settings_otp_confirm.yaml b/...r_otp/test_user_settings_otp_confirm.yaml → ...r_otp/test_user_settings_otp_confirm.yaml
diff --git a/...er_otp/test_user_settings_otp_delete.yaml → ...er_otp/test_user_settings_otp_delete.yaml b/...er_otp/test_user_settings_otp_delete.yaml → ...er_otp/test_user_settings_otp_delete.yaml
diff --git a/...ser_settings_otp_delete_invalid_form.yaml → ...ser_settings_otp_delete_invalid_form.yaml b/...ser_settings_otp_delete_invalid_form.yaml → ...ser_settings_otp_delete_invalid_form.yaml
diff --git a/...er_settings_otp_delete_ipabadrequest.yaml → ...er_settings_otp_delete_ipabadrequest.yaml b/...er_settings_otp_delete_ipabadrequest.yaml → ...er_settings_otp_delete_ipabadrequest.yaml
diff --git a/..._user_settings_otp_delete_ipafailure.yaml → ..._user_settings_otp_delete_ipafailure.yaml b/..._user_settings_otp_delete_ipafailure.yaml → ..._user_settings_otp_delete_ipafailure.yaml
diff --git a/...t_user_settings_otp_delete_lasttoken.yaml → ...t_user_settings_otp_delete_lasttoken.yaml b/...t_user_settings_otp_delete_lasttoken.yaml → ...t_user_settings_otp_delete_lasttoken.yaml
diff --git a/...er_settings_otp_delete_no_permission.yaml → ...er_settings_otp_delete_no_permission.yaml b/...er_settings_otp_delete_no_permission.yaml → ...er_settings_otp_delete_no_permission.yaml
diff --git a/...r_otp/test_user_settings_otp_disable.yaml → ...r_otp/test_user_settings_otp_disable.yaml b/...r_otp/test_user_settings_otp_disable.yaml → ...r_otp/test_user_settings_otp_disable.yaml
diff --git a/...er_settings_otp_disable_invalid_form.yaml → ...er_settings_otp_disable_invalid_form.yaml b/...er_settings_otp_disable_invalid_form.yaml → ...er_settings_otp_disable_invalid_form.yaml
diff --git a/...r_settings_otp_disable_ipabadrequest.yaml → ...r_settings_otp_disable_ipabadrequest.yaml b/...r_settings_otp_disable_ipabadrequest.yaml → ...r_settings_otp_disable_ipabadrequest.yaml
diff --git a/...t_user_settings_otp_disable_ipaerror.yaml → ...t_user_settings_otp_disable_ipaerror.yaml b/...t_user_settings_otp_disable_ipaerror.yaml → ...t_user_settings_otp_disable_ipaerror.yaml
diff --git a/..._user_settings_otp_disable_lasttoken.yaml → ..._user_settings_otp_disable_lasttoken.yaml b/..._user_settings_otp_disable_lasttoken.yaml → ..._user_settings_otp_disable_lasttoken.yaml
diff --git a/...r_settings_otp_disable_no_permission.yaml → ...r_settings_otp_disable_no_permission.yaml b/...r_settings_otp_disable_no_permission.yaml → ...r_settings_otp_disable_no_permission.yaml
diff --git a/...er_otp/test_user_settings_otp_enable.yaml → ...er_otp/test_user_settings_otp_enable.yaml b/...er_otp/test_user_settings_otp_enable.yaml → ...er_otp/test_user_settings_otp_enable.yaml
diff --git a/...ser_settings_otp_enable_invalid_form.yaml → ...ser_settings_otp_enable_invalid_form.yaml b/...ser_settings_otp_enable_invalid_form.yaml → ...ser_settings_otp_enable_invalid_form.yaml
diff --git a/...st_user_settings_otp_enable_ipaerror.yaml → ...st_user_settings_otp_enable_ipaerror.yaml b/...st_user_settings_otp_enable_ipaerror.yaml → ...st_user_settings_otp_enable_ipaerror.yaml
diff --git a/...er_settings_otp_enable_no_permission.yaml → ...er_settings_otp_enable_no_permission.yaml b/...er_settings_otp_enable_no_permission.yaml → ...er_settings_otp_enable_no_permission.yaml
diff --git a/...test_user_settings_otp_no_permission.yaml → ...test_user_settings_otp_no_permission.yaml b/...test_user_settings_otp_no_permission.yaml → ...test_user_settings_otp_no_permission.yaml
diff --git a/...er_otp/test_user_settings_otp_rename.yaml → ...er_otp/test_user_settings_otp_rename.yaml b/...er_otp/test_user_settings_otp_rename.yaml → ...er_otp/test_user_settings_otp_rename.yaml
diff --git a/...ser_settings_otp_rename_invalid_form.yaml → ...ser_settings_otp_rename_invalid_form.yaml b/...ser_settings_otp_rename_invalid_form.yaml → ...ser_settings_otp_rename_invalid_form.yaml
diff --git a/...st_user_settings_otp_rename_ipaerror.yaml → ...st_user_settings_otp_rename_ipaerror.yaml b/...st_user_settings_otp_rename_ipaerror.yaml → ...st_user_settings_otp_rename_ipaerror.yaml
diff --git a/...t_user_settings_otp_rename_no_change.yaml → ...t_user_settings_otp_rename_no_change.yaml b/...t_user_settings_otp_rename_no_change.yaml → ...t_user_settings_otp_rename_no_change.yaml
diff --git a/...ts/unit/controller/test_authentication.py → tests/unit/controller/test_authentication.py b/...ts/unit/controller/test_authentication.py → tests/unit/controller/test_authentication.py
@@ -8,7 +8,8 @@
 from flask import current_app, get_flashed_messages, session
 
 from noggin.app import ipa_admin
-from noggin.tests.unit.utilities import (
+
+from ..utilities import (
     assert_form_field_error,
     assert_form_generic_error,
     assert_redirects_with_flash,

diff --git a/...s/unit/controller/test_forgot_password.py → ...s/unit/controller/test_forgot_password.py b/...s/unit/controller/test_forgot_password.py → ...s/unit/controller/test_forgot_password.py
@@ -10,13 +10,6 @@
 from noggin.app import ipa_admin, mailer
 from noggin.representation.user import User
 from noggin.security.ipa import untouched_ipa_client
-from noggin.tests.unit.utilities import (
-    assert_form_field_error,
-    assert_form_generic_error,
-    assert_redirects_with_flash,
-    get_otp,
-    otp_secret_from_uri,
-)
 from noggin.utility.password_reset import PasswordResetLock
 from noggin.utility.token import (
     Audience,
@@ -26,6 +19,14 @@
 )
 from noggin_messages import UserUpdateV1
 
+from ..utilities import (
+    assert_form_field_error,
+    assert_form_generic_error,
+    assert_redirects_with_flash,
+    get_otp,
+    otp_secret_from_uri,
+)
+
 
 @pytest.fixture
 def token_for_dummy_user(dummy_user):

diff --git a/noggin/tests/unit/controller/test_group.py → tests/unit/controller/test_group.py b/noggin/tests/unit/controller/test_group.py → tests/unit/controller/test_group.py
@@ -8,9 +8,10 @@
 from flask import Markup
 
 from noggin.app import ipa_admin
-from noggin.tests.unit.utilities import assert_redirects_with_flash
 from noggin_messages import MemberSponsorV1
 
+from ..utilities import assert_redirects_with_flash
+
 
 @pytest.mark.vcr()
 def test_groups_list(client, logged_in_dummy_user, dummy_group):

diff --git a/...ts/unit/controller/test_password_reset.py → tests/unit/controller/test_password_reset.py b/...ts/unit/controller/test_password_reset.py → tests/unit/controller/test_password_reset.py
@@ -4,12 +4,13 @@
 from fedora_messaging import testing as fml_testing
 
 from noggin.app import ipa_admin
-from noggin.tests.unit.utilities import (
+from noggin_messages import UserUpdateV1
+
+from ..utilities import (
     assert_form_field_error,
     assert_form_generic_error,
     assert_redirects_with_flash,
 )
-from noggin_messages import UserUpdateV1
 
 
 def test_password_reset(client):

diff --git a/...ests/unit/controller/test_registration.py → tests/unit/controller/test_registration.py b/...ests/unit/controller/test_registration.py → tests/unit/controller/test_registration.py
@@ -10,13 +10,14 @@
 from noggin.representation.user import User
 from noggin.security.ipa import maybe_ipa_login
 from noggin.signals import stageuser_created, user_registered
-from noggin.tests.unit.utilities import (
+from noggin.utility.token import Audience, make_token
+from noggin_messages import UserCreateV1
+
+from ..utilities import (
     assert_form_field_error,
     assert_form_generic_error,
     assert_redirects_with_flash,
 )
-from noggin.utility.token import Audience, make_token
-from noggin_messages import UserCreateV1
 
 
 @pytest.fixture

diff --git a/noggin/tests/unit/controller/test_root.py → tests/unit/controller/test_root.py b/noggin/tests/unit/controller/test_root.py → tests/unit/controller/test_root.py
diff --git a/noggin/tests/unit/controller/test_user.py → tests/unit/controller/test_user.py b/noggin/tests/unit/controller/test_user.py → tests/unit/controller/test_user.py
@@ -8,13 +8,11 @@
 
 from noggin.app import ipa_admin, mailer
 from noggin.representation.user import User
-from noggin.tests.unit.utilities import (
-    assert_form_generic_error,
-    assert_redirects_with_flash,
-)
 from noggin.utility.token import Audience, make_token
 from noggin_messages import UserUpdateV1
 
+from ..utilities import assert_form_generic_error, assert_redirects_with_flash
+
 
 POST_CONTENTS = {
     "firstname": "Dummy",

diff --git a/...in/tests/unit/controller/test_user_otp.py → tests/unit/controller/test_user_otp.py b/...in/tests/unit/controller/test_user_otp.py → tests/unit/controller/test_user_otp.py
@@ -8,7 +8,8 @@
 
 from noggin.app import ipa_admin
 from noggin.representation.otptoken import OTPToken
-from noggin.tests.unit.utilities import (
+
+from ..utilities import (
     assert_form_field_error,
     assert_form_generic_error,
     assert_redirects_with_flash,

diff --git a/noggin/tests/unit/form/__init__.py → tests/unit/form/__init__.py b/noggin/tests/unit/form/__init__.py → tests/unit/form/__init__.py
diff --git a/noggin/tests/unit/form/test_base.py → tests/unit/form/test_base.py b/noggin/tests/unit/form/test_base.py → tests/unit/form/test_base.py
diff --git a/noggin/tests/unit/form/test_edit_user.py → tests/unit/form/test_edit_user.py b/noggin/tests/unit/form/test_edit_user.py → tests/unit/form/test_edit_user.py
diff --git a/noggin/tests/unit/representation/__init__.py → tests/unit/representation/__init__.py b/noggin/tests/unit/representation/__init__.py → tests/unit/representation/__init__.py
diff --git a/noggin/tests/unit/representation/conftest.py → tests/unit/representation/conftest.py b/noggin/tests/unit/representation/conftest.py → tests/unit/representation/conftest.py
diff --git a/...sts/unit/representation/test_agreement.py → tests/unit/representation/test_agreement.py b/...sts/unit/representation/test_agreement.py → tests/unit/representation/test_agreement.py
diff --git a/...in/tests/unit/representation/test_base.py → tests/unit/representation/test_base.py b/...in/tests/unit/representation/test_base.py → tests/unit/representation/test_base.py
diff --git a/...n/tests/unit/representation/test_group.py → tests/unit/representation/test_group.py b/...n/tests/unit/representation/test_group.py → tests/unit/representation/test_group.py
diff --git a/...ests/unit/representation/test_otptoken.py → tests/unit/representation/test_otptoken.py b/...ests/unit/representation/test_otptoken.py → tests/unit/representation/test_otptoken.py
diff --git a/...in/tests/unit/representation/test_user.py → tests/unit/representation/test_user.py b/...in/tests/unit/representation/test_user.py → tests/unit/representation/test_user.py
diff --git a/noggin/tests/unit/security/__init__.py → tests/unit/security/__init__.py b/noggin/tests/unit/security/__init__.py → tests/unit/security/__init__.py
diff --git a/...ettes/test_ipa/test_ipa_client_batch.yaml → ...ettes/test_ipa/test_ipa_client_batch.yaml b/...ettes/test_ipa/test_ipa_client_batch.yaml → ...ettes/test_ipa/test_ipa_client_batch.yaml
diff --git a/...est_ipa_client_batch_no_raise_errors.yaml → ...est_ipa_client_batch_no_raise_errors.yaml b/...est_ipa_client_batch_no_raise_errors.yaml → ...est_ipa_client_batch_no_raise_errors.yaml
diff --git a/...test_ipa_client_batch_unknown_method.yaml → ...test_ipa_client_batch_unknown_method.yaml b/...test_ipa_client_batch_unknown_method.yaml → ...test_ipa_client_batch_unknown_method.yaml
diff --git a/...test_ipa_client_batch_unknown_option.yaml → ...test_ipa_client_batch_unknown_option.yaml b/...test_ipa_client_batch_unknown_option.yaml → ...test_ipa_client_batch_unknown_option.yaml
diff --git a/...ipa/test_ipa_client_fasagreement_add.yaml → ...ipa/test_ipa_client_fasagreement_add.yaml b/...ipa/test_ipa_client_fasagreement_add.yaml → ...ipa/test_ipa_client_fasagreement_add.yaml
diff --git a/...st_ipa_client_fasagreement_add_group.yaml → ...st_ipa_client_fasagreement_add_group.yaml b/...st_ipa_client_fasagreement_add_group.yaml → ...st_ipa_client_fasagreement_add_group.yaml
diff --git a/...est_ipa_client_fasagreement_add_user.yaml → ...est_ipa_client_fasagreement_add_user.yaml b/...est_ipa_client_fasagreement_add_user.yaml → ...est_ipa_client_fasagreement_add_user.yaml
diff --git a/...pa/test_ipa_client_fasagreement_find.yaml → ...pa/test_ipa_client_fasagreement_find.yaml b/...pa/test_ipa_client_fasagreement_find.yaml → ...pa/test_ipa_client_fasagreement_find.yaml
diff --git a/...ty/cassettes/test_ipa/test_ipa_login.yaml → ...ty/cassettes/test_ipa/test_ipa_login.yaml b/...ty/cassettes/test_ipa/test_ipa_login.yaml → ...ty/cassettes/test_ipa/test_ipa_login.yaml
diff --git a/...tes/test_ipa/test_ipa_session_authed.yaml → ...tes/test_ipa/test_ipa_session_authed.yaml b/...tes/test_ipa/test_ipa_session_authed.yaml → ...tes/test_ipa/test_ipa_session_authed.yaml
diff --git a/...es/test_ipa/test_ipa_session_invalid.yaml → ...es/test_ipa/test_ipa_session_invalid.yaml b/...es/test_ipa/test_ipa_session_invalid.yaml → ...es/test_ipa/test_ipa_session_invalid.yaml
diff --git a/...st_ipa/test_ipa_session_unauthorized.yaml → ...st_ipa/test_ipa_session_unauthorized.yaml b/...st_ipa/test_ipa_session_unauthorized.yaml → ...st_ipa/test_ipa_session_unauthorized.yaml
diff --git a/noggin/tests/unit/security/test_ipa.py → tests/unit/security/test_ipa.py b/noggin/tests/unit/security/test_ipa.py → tests/unit/security/test_ipa.py
diff --git a/noggin/tests/unit/security/test_ipa_admin.py → tests/unit/security/test_ipa_admin.py b/noggin/tests/unit/security/test_ipa_admin.py → tests/unit/security/test_ipa_admin.py
diff --git a/noggin/tests/unit/test_app.py → tests/unit/test_app.py b/noggin/tests/unit/test_app.py → tests/unit/test_app.py
diff --git a/noggin/tests/unit/test_l10n.py → tests/unit/test_l10n.py b/noggin/tests/unit/test_l10n.py → tests/unit/test_l10n.py
diff --git a/noggin/tests/unit/test_middleware.py → tests/unit/test_middleware.py b/noggin/tests/unit/test_middleware.py → tests/unit/test_middleware.py
diff --git a/noggin/tests/unit/test_signals.py → tests/unit/test_signals.py b/noggin/tests/unit/test_signals.py → tests/unit/test_signals.py
diff --git a/noggin/tests/unit/test_themes.py → tests/unit/test_themes.py b/noggin/tests/unit/test_themes.py → tests/unit/test_themes.py
diff --git a/noggin/tests/unit/translations/__init__.py → tests/unit/translations/__init__.py b/noggin/tests/unit/translations/__init__.py → tests/unit/translations/__init__.py
diff --git a/...ions/test_translation_in_code_french.yaml → ...ions/test_translation_in_code_french.yaml b/...ions/test_translation_in_code_french.yaml → ...ions/test_translation_in_code_french.yaml
diff --git a/...ts/unit/translations/test_translations.py → tests/unit/translations/test_translations.py b/...ts/unit/translations/test_translations.py → tests/unit/translations/test_translations.py
@@ -5,7 +5,8 @@
 from bs4 import BeautifulSoup
 
 import noggin
-from noggin.tests.unit.utilities import assert_redirects_with_flash
+
+from ..utilities import assert_redirects_with_flash
 
 
 @pytest.fixture

diff --git a/noggin/tests/unit/utilities.py → tests/unit/utilities.py b/noggin/tests/unit/utilities.py → tests/unit/utilities.py
diff --git a/noggin/tests/unit/utility/__init__.py → tests/unit/utility/__init__.py b/noggin/tests/unit/utility/__init__.py → tests/unit/utility/__init__.py
diff --git a/...s/test_controllers/test_group_or_404.yaml → ...s/test_controllers/test_group_or_404.yaml b/...s/test_controllers/test_group_or_404.yaml → ...s/test_controllers/test_group_or_404.yaml
diff --git a/...ontrollers/test_group_or_404_unknown.yaml → ...ontrollers/test_group_or_404_unknown.yaml b/...ontrollers/test_group_or_404_unknown.yaml → ...ontrollers/test_group_or_404_unknown.yaml
diff --git a/...es/test_controllers/test_user_or_404.yaml → ...es/test_controllers/test_user_or_404.yaml b/...es/test_controllers/test_user_or_404.yaml → ...es/test_controllers/test_user_or_404.yaml
diff --git a/...controllers/test_user_or_404_unknown.yaml → ...controllers/test_user_or_404_unknown.yaml b/...controllers/test_user_or_404_unknown.yaml → ...controllers/test_user_or_404_unknown.yaml
diff --git a/...ettes/test_controllers/test_with_ipa.yaml → ...ettes/test_controllers/test_with_ipa.yaml b/...ettes/test_controllers/test_with_ipa.yaml → ...ettes/test_controllers/test_with_ipa.yaml
diff --git a/...tes/test_pagination/test_groups_page.yaml → ...tes/test_pagination/test_groups_page.yaml b/...tes/test_pagination/test_groups_page.yaml → ...tes/test_pagination/test_groups_page.yaml
diff --git a/...pagination/test_groups_page_nopaging.yaml → ...pagination/test_groups_page_nopaging.yaml b/...pagination/test_groups_page_nopaging.yaml → ...pagination/test_groups_page_nopaging.yaml
diff --git a/.../test_pagination/test_mounted_subdir.yaml → .../test_pagination/test_mounted_subdir.yaml b/.../test_pagination/test_mounted_subdir.yaml → .../test_pagination/test_mounted_subdir.yaml
diff --git a/...st_pagination_bar[1-40-page_result3].yaml → ...st_pagination_bar[1-40-page_result3].yaml b/...st_pagination_bar[1-40-page_result3].yaml → ...st_pagination_bar[1-40-page_result3].yaml
diff --git a/...est_pagination_bar[2-3-page_result0].yaml → ...est_pagination_bar[2-3-page_result0].yaml b/...est_pagination_bar[2-3-page_result0].yaml → ...est_pagination_bar[2-3-page_result0].yaml
diff --git a/...st_pagination_bar[30-3-page_result2].yaml → ...st_pagination_bar[30-3-page_result2].yaml b/...st_pagination_bar[30-3-page_result2].yaml → ...st_pagination_bar[30-3-page_result2].yaml
diff --git a/...st_pagination_bar[67-3-page_result1].yaml → ...st_pagination_bar[67-3-page_result1].yaml b/...st_pagination_bar[67-3-page_result1].yaml → ...st_pagination_bar[67-3-page_result1].yaml
diff --git a/...in/tests/unit/utility/test_controllers.py → tests/unit/utility/test_controllers.py b/...in/tests/unit/utility/test_controllers.py → tests/unit/utility/test_controllers.py
diff --git a/noggin/tests/unit/utility/test_forms.py → tests/unit/utility/test_forms.py b/noggin/tests/unit/utility/test_forms.py → tests/unit/utility/test_forms.py
diff --git a/noggin/tests/unit/utility/test_messaging.py → tests/unit/utility/test_messaging.py b/noggin/tests/unit/utility/test_messaging.py → tests/unit/utility/test_messaging.py
diff --git a/noggin/tests/unit/utility/test_pagination.py → tests/unit/utility/test_pagination.py b/noggin/tests/unit/utility/test_pagination.py → tests/unit/utility/test_pagination.py
diff --git a/...tests/unit/utility/test_password_reset.py → tests/unit/utility/test_password_reset.py b/...tests/unit/utility/test_password_reset.py → tests/unit/utility/test_password_reset.py
diff --git a/noggin/tests/unit/utility/test_templates.py → tests/unit/utility/test_templates.py b/noggin/tests/unit/utility/test_templates.py → tests/unit/utility/test_templates.py
diff --git a/tox.ini b/tox.ini
@@ -9,8 +9,8 @@ requires =
 passenv = HOME
 sitepackages = false
 commands =
-    unittest: pytest -vv --cov --cov-append --cov-report= noggin/tests/unit {posargs}
-    integration: pytest -vv --no-cov noggin/tests/integration {posargs}
+    unittest: pytest -vv --cov --cov-append --cov-report= tests/unit {posargs}
+    integration: pytest -vv --no-cov tests/integration {posargs}
 depends =
     {py39,py310}: covclean
     covreport: py39-unittest,py310-unittest