diff --git a/tasks/main.yml b/tasks/main.yml
index ef5f048..5bfaa39 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -47,15 +47,15 @@
   tags:
     - always
 
-- include: heat_pre_install.yml
+- include_tasks: heat_pre_install.yml
   tags:
     - heat-install
 
-- include: heat_install.yml
+- include_tasks: heat_install.yml
   tags:
     - heat-install
 
-- include: heat_post_install.yml
+- include_tasks: heat_post_install.yml
   tags:
     - heat-config
 
@@ -87,7 +87,7 @@
     - heat-config
     - systemd-service
 
-- include: heat_domain_setup.yml
+- include_tasks: heat_domain_setup.yml
   static: no
   when:
     - "inventory_hostname == ansible_play_hosts[0]"
@@ -113,18 +113,18 @@
   tags:
     - heat-config
 
-- include: heat_db_setup.yml
+- include_tasks: heat_db_setup.yml
   static: no
   when:
     - "inventory_hostname == ansible_play_hosts[0]"
   tags:
     - heat-config
 
-- include: heat_uwsgi.yml
+- include_tasks: heat_uwsgi.yml
   tags:
     - heat-config
 
-- include: heat_service_setup.yml
+- include_tasks: heat_service_setup.yml
   static: no
   when:
     - "inventory_hostname == ansible_play_hosts[0]"
diff --git a/tests/test.yml b/tests/test.yml
index 866acbc..0a584a7 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -14,16 +14,16 @@
 # limitations under the License.
 
 # Setup the host
-- include: common/test-setup-host.yml
+- import_playbook: common/test-setup-host.yml
 
 # Install RabbitMQ/MariaDB
-- include: common/test-install-infra.yml
+- import_playbook: common/test-install-infra.yml
 
 # Install Keystone
-- include: common/test-install-keystone.yml
+- import_playbook: common/test-install-keystone.yml
 
 # Install Heat
-- include: common/test-install-heat.yml
+- import_playbook: common/test-install-heat.yml
 
 # Test Heat
-- include: test-heat-functional.yml
+- import_playbook: test-heat-functional.yml