diff --git a/heat/tests/mistral/__init__.py b/heat/tests/openstack/mistral/__init__.py
similarity index 100%
rename from heat/tests/mistral/__init__.py
rename to heat/tests/openstack/mistral/__init__.py
diff --git a/heat/tests/mistral/test_mistral_cron_trigger.py b/heat/tests/openstack/mistral/test_cron_trigger.py
similarity index 100%
rename from heat/tests/mistral/test_mistral_cron_trigger.py
rename to heat/tests/openstack/mistral/test_cron_trigger.py
diff --git a/heat/tests/mistral/test_mistral_workflow.py b/heat/tests/openstack/mistral/test_workflow.py
similarity index 100%
rename from heat/tests/mistral/test_mistral_workflow.py
rename to heat/tests/openstack/mistral/test_workflow.py