diff --git a/heat/tests/api/openstack/__init__.py b/heat/tests/api/openstack_v1/__init__.py
similarity index 100%
rename from heat/tests/api/openstack/__init__.py
rename to heat/tests/api/openstack_v1/__init__.py
diff --git a/heat/tests/api/openstack/test_api_openstack_v1.py b/heat/tests/api/openstack_v1/test_api_openstack_v1.py
similarity index 100%
rename from heat/tests/api/openstack/test_api_openstack_v1.py
rename to heat/tests/api/openstack_v1/test_api_openstack_v1.py
diff --git a/heat/tests/api/openstack/test_api_openstack_v1_views_stacks_view_builder.py b/heat/tests/api/openstack_v1/test_stacks_view.py
similarity index 100%
rename from heat/tests/api/openstack/test_api_openstack_v1_views_stacks_view_builder.py
rename to heat/tests/api/openstack_v1/test_stacks_view.py
diff --git a/heat/tests/api/openstack/test_api_openstack_v1_util.py b/heat/tests/api/openstack_v1/test_util.py
similarity index 100%
rename from heat/tests/api/openstack/test_api_openstack_v1_util.py
rename to heat/tests/api/openstack_v1/test_util.py
diff --git a/heat/tests/api/openstack/test_api_openstack_v1_views_views_common.py b/heat/tests/api/openstack_v1/test_views_common.py
similarity index 100%
rename from heat/tests/api/openstack/test_api_openstack_v1_views_views_common.py
rename to heat/tests/api/openstack_v1/test_views_common.py