diff --git a/awx/main/tests/functional/test_rbac_api.py b/awx/main/tests/functional/rbac/test_rbac_api.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_api.py
rename to awx/main/tests/functional/rbac/test_rbac_api.py
diff --git a/awx/main/tests/functional/test_rbac_credential.py b/awx/main/tests/functional/rbac/test_rbac_credential.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_credential.py
rename to awx/main/tests/functional/rbac/test_rbac_credential.py
diff --git a/awx/main/tests/functional/test_rbac_execution_environment.py b/awx/main/tests/functional/rbac/test_rbac_execution_environment.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_execution_environment.py
rename to awx/main/tests/functional/rbac/test_rbac_execution_environment.py
diff --git a/awx/main/tests/functional/test_rbac_instance_groups.py b/awx/main/tests/functional/rbac/test_rbac_instance_groups.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_instance_groups.py
rename to awx/main/tests/functional/rbac/test_rbac_instance_groups.py
diff --git a/awx/main/tests/functional/test_rbac_inventory.py b/awx/main/tests/functional/rbac/test_rbac_inventory.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_inventory.py
rename to awx/main/tests/functional/rbac/test_rbac_inventory.py
diff --git a/awx/main/tests/functional/test_rbac_job.py b/awx/main/tests/functional/rbac/test_rbac_job.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_job.py
rename to awx/main/tests/functional/rbac/test_rbac_job.py
diff --git a/awx/main/tests/functional/test_rbac_job_start.py b/awx/main/tests/functional/rbac/test_rbac_job_start.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_job_start.py
rename to awx/main/tests/functional/rbac/test_rbac_job_start.py
diff --git a/awx/main/tests/functional/test_rbac_job_templates.py b/awx/main/tests/functional/rbac/test_rbac_job_templates.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_job_templates.py
rename to awx/main/tests/functional/rbac/test_rbac_job_templates.py
diff --git a/awx/main/tests/functional/test_rbac_label.py b/awx/main/tests/functional/rbac/test_rbac_label.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_label.py
rename to awx/main/tests/functional/rbac/test_rbac_label.py
diff --git a/awx/main/tests/functional/test_rbac_migration.py b/awx/main/tests/functional/rbac/test_rbac_migration.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_migration.py
rename to awx/main/tests/functional/rbac/test_rbac_migration.py
diff --git a/awx/main/tests/functional/test_rbac_notifications.py b/awx/main/tests/functional/rbac/test_rbac_notifications.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_notifications.py
rename to awx/main/tests/functional/rbac/test_rbac_notifications.py
diff --git a/awx/main/tests/functional/test_rbac_organization.py b/awx/main/tests/functional/rbac/test_rbac_organization.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_organization.py
rename to awx/main/tests/functional/rbac/test_rbac_organization.py
diff --git a/awx/main/tests/functional/test_rbac_project.py b/awx/main/tests/functional/rbac/test_rbac_project.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_project.py
rename to awx/main/tests/functional/rbac/test_rbac_project.py
diff --git a/awx/main/tests/functional/test_rbac_role.py b/awx/main/tests/functional/rbac/test_rbac_role.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_role.py
rename to awx/main/tests/functional/rbac/test_rbac_role.py
diff --git a/awx/main/tests/functional/test_rbac_team.py b/awx/main/tests/functional/rbac/test_rbac_team.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_team.py
rename to awx/main/tests/functional/rbac/test_rbac_team.py
diff --git a/awx/main/tests/functional/test_rbac_user.py b/awx/main/tests/functional/rbac/test_rbac_user.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_user.py
rename to awx/main/tests/functional/rbac/test_rbac_user.py
diff --git a/awx/main/tests/functional/test_rbac_workflow.py b/awx/main/tests/functional/rbac/test_rbac_workflow.py
similarity index 100%
rename from awx/main/tests/functional/test_rbac_workflow.py
rename to awx/main/tests/functional/rbac/test_rbac_workflow.py