diff --git a/heat/tests/keystone/__init__.py b/heat/tests/openstack/keystone/__init__.py
similarity index 100%
rename from heat/tests/keystone/__init__.py
rename to heat/tests/openstack/keystone/__init__.py
diff --git a/heat/tests/keystone/test_endpoint.py b/heat/tests/openstack/keystone/test_endpoint.py
similarity index 100%
rename from heat/tests/keystone/test_endpoint.py
rename to heat/tests/openstack/keystone/test_endpoint.py
diff --git a/heat/tests/keystone/test_group.py b/heat/tests/openstack/keystone/test_group.py
similarity index 100%
rename from heat/tests/keystone/test_group.py
rename to heat/tests/openstack/keystone/test_group.py
diff --git a/heat/tests/keystone/test_project.py b/heat/tests/openstack/keystone/test_project.py
similarity index 100%
rename from heat/tests/keystone/test_project.py
rename to heat/tests/openstack/keystone/test_project.py
diff --git a/heat/tests/keystone/test_role.py b/heat/tests/openstack/keystone/test_role.py
similarity index 100%
rename from heat/tests/keystone/test_role.py
rename to heat/tests/openstack/keystone/test_role.py
diff --git a/heat/tests/keystone/test_role_assignments.py b/heat/tests/openstack/keystone/test_role_assignments.py
similarity index 100%
rename from heat/tests/keystone/test_role_assignments.py
rename to heat/tests/openstack/keystone/test_role_assignments.py
diff --git a/heat/tests/keystone/test_service.py b/heat/tests/openstack/keystone/test_service.py
similarity index 100%
rename from heat/tests/keystone/test_service.py
rename to heat/tests/openstack/keystone/test_service.py
diff --git a/heat/tests/keystone/test_user.py b/heat/tests/openstack/keystone/test_user.py
similarity index 100%
rename from heat/tests/keystone/test_user.py
rename to heat/tests/openstack/keystone/test_user.py