diff --git a/awx/main/tests/old/README.md b/awx/main/tests/old/README.md
new file mode 100644
index 0000000000..92582d890d
--- /dev/null
+++ b/awx/main/tests/old/README.md
@@ -0,0 +1,7 @@
+Old Tests
+=========
+This are the old django.TestCase / unittest.TestCase tests for Tower.
+
+No new tests should be added to this folder. Overtime, we will be refactoring
+tests out of this folder as py.test tests and into their respective functional
+and unit folders.
diff --git a/awx/main/tests/functional/activity_stream.py b/awx/main/tests/old/activity_stream.py
similarity index 100%
rename from awx/main/tests/functional/activity_stream.py
rename to awx/main/tests/old/activity_stream.py
diff --git a/awx/main/tests/functional/ad_hoc.py b/awx/main/tests/old/ad_hoc.py
similarity index 100%
rename from awx/main/tests/functional/ad_hoc.py
rename to awx/main/tests/old/ad_hoc.py
diff --git a/awx/main/tests/functional/commands/age_deleted.py b/awx/main/tests/old/commands/age_deleted.py
similarity index 100%
rename from awx/main/tests/functional/commands/age_deleted.py
rename to awx/main/tests/old/commands/age_deleted.py
diff --git a/awx/main/tests/functional/commands/cleanup_facts.py b/awx/main/tests/old/commands/cleanup_facts.py
similarity index 100%
rename from awx/main/tests/functional/commands/cleanup_facts.py
rename to awx/main/tests/old/commands/cleanup_facts.py
diff --git a/awx/main/tests/functional/commands/command_base.py b/awx/main/tests/old/commands/command_base.py
similarity index 100%
rename from awx/main/tests/functional/commands/command_base.py
rename to awx/main/tests/old/commands/command_base.py
diff --git a/awx/main/tests/functional/commands/commands_monolithic.py b/awx/main/tests/old/commands/commands_monolithic.py
similarity index 100%
rename from awx/main/tests/functional/commands/commands_monolithic.py
rename to awx/main/tests/old/commands/commands_monolithic.py
diff --git a/awx/main/tests/functional/commands/remove_instance.py b/awx/main/tests/old/commands/remove_instance.py
similarity index 100%
rename from awx/main/tests/functional/commands/remove_instance.py
rename to awx/main/tests/old/commands/remove_instance.py
diff --git a/awx/main/tests/functional/commands/run_fact_cache_receiver.py b/awx/main/tests/old/commands/run_fact_cache_receiver.py
similarity index 100%
rename from awx/main/tests/functional/commands/run_fact_cache_receiver.py
rename to awx/main/tests/old/commands/run_fact_cache_receiver.py
diff --git a/awx/main/tests/functional/commands/run_socketio_service.py b/awx/main/tests/old/commands/run_socketio_service.py
similarity index 100%
rename from awx/main/tests/functional/commands/run_socketio_service.py
rename to awx/main/tests/old/commands/run_socketio_service.py
diff --git a/awx/main/tests/functional/commands/update_password.py b/awx/main/tests/old/commands/update_password.py
similarity index 100%
rename from awx/main/tests/functional/commands/update_password.py
rename to awx/main/tests/old/commands/update_password.py
diff --git a/awx/main/tests/functional/fact/fact_api.py b/awx/main/tests/old/fact/fact_api.py
similarity index 100%
rename from awx/main/tests/functional/fact/fact_api.py
rename to awx/main/tests/old/fact/fact_api.py
diff --git a/awx/main/tests/functional/ha.py b/awx/main/tests/old/ha.py
similarity index 100%
rename from awx/main/tests/functional/ha.py
rename to awx/main/tests/old/ha.py
diff --git a/awx/main/tests/functional/inventory.py b/awx/main/tests/old/inventory.py
similarity index 100%
rename from awx/main/tests/functional/inventory.py
rename to awx/main/tests/old/inventory.py
diff --git a/awx/main/tests/functional/jobs/job_launch.py b/awx/main/tests/old/jobs/job_launch.py
similarity index 100%
rename from awx/main/tests/functional/jobs/job_launch.py
rename to awx/main/tests/old/jobs/job_launch.py
diff --git a/awx/main/tests/functional/jobs/job_relaunch.py b/awx/main/tests/old/jobs/job_relaunch.py
similarity index 100%
rename from awx/main/tests/functional/jobs/job_relaunch.py
rename to awx/main/tests/old/jobs/job_relaunch.py
diff --git a/awx/main/tests/functional/jobs/jobs_monolithic.py b/awx/main/tests/old/jobs/jobs_monolithic.py
similarity index 100%
rename from awx/main/tests/functional/jobs/jobs_monolithic.py
rename to awx/main/tests/old/jobs/jobs_monolithic.py
diff --git a/awx/main/tests/functional/jobs/start_cancel.py b/awx/main/tests/old/jobs/start_cancel.py
similarity index 100%
rename from awx/main/tests/functional/jobs/start_cancel.py
rename to awx/main/tests/old/jobs/start_cancel.py
diff --git a/awx/main/tests/functional/jobs/survey_password.py b/awx/main/tests/old/jobs/survey_password.py
similarity index 100%
rename from awx/main/tests/functional/jobs/survey_password.py
rename to awx/main/tests/old/jobs/survey_password.py
diff --git a/awx/main/tests/functional/licenses.py b/awx/main/tests/old/licenses.py
similarity index 100%
rename from awx/main/tests/functional/licenses.py
rename to awx/main/tests/old/licenses.py
diff --git a/awx/main/tests/functional/organizations.py b/awx/main/tests/old/organizations.py
similarity index 100%
rename from awx/main/tests/functional/organizations.py
rename to awx/main/tests/old/organizations.py
diff --git a/awx/main/tests/functional/projects.py b/awx/main/tests/old/projects.py
similarity index 100%
rename from awx/main/tests/functional/projects.py
rename to awx/main/tests/old/projects.py
diff --git a/awx/main/tests/functional/redact.py b/awx/main/tests/old/redact.py
similarity index 100%
rename from awx/main/tests/functional/redact.py
rename to awx/main/tests/old/redact.py
diff --git a/awx/main/tests/functional/schedules.py b/awx/main/tests/old/schedules.py
similarity index 100%
rename from awx/main/tests/functional/schedules.py
rename to awx/main/tests/old/schedules.py
diff --git a/awx/main/tests/functional/scripts.py b/awx/main/tests/old/scripts.py
similarity index 100%
rename from awx/main/tests/functional/scripts.py
rename to awx/main/tests/old/scripts.py
diff --git a/awx/main/tests/functional/settings.py b/awx/main/tests/old/settings.py
similarity index 100%
rename from awx/main/tests/functional/settings.py
rename to awx/main/tests/old/settings.py
diff --git a/awx/main/tests/functional/tasks.py b/awx/main/tests/old/tasks.py
similarity index 100%
rename from awx/main/tests/functional/tasks.py
rename to awx/main/tests/old/tasks.py
diff --git a/awx/main/tests/functional/unified_jobs.py b/awx/main/tests/old/unified_jobs.py
similarity index 100%
rename from awx/main/tests/functional/unified_jobs.py
rename to awx/main/tests/old/unified_jobs.py
diff --git a/awx/main/tests/functional/users.py b/awx/main/tests/old/users.py
similarity index 100%
rename from awx/main/tests/functional/users.py
rename to awx/main/tests/old/users.py
diff --git a/awx/main/tests/functional/views.py b/awx/main/tests/old/views.py
similarity index 100%
rename from awx/main/tests/functional/views.py
rename to awx/main/tests/old/views.py