diff --git a/tasks/main.yml b/tasks/main.yml
index a48dcd2..3b4d3d5 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,19 +25,19 @@
   tags:
     - always
 
-- include: rally_pre_install.yml
+- include_tasks: rally_pre_install.yml
   tags:
     - rally-install
 
-- include: rally_install.yml
+- include_tasks: rally_install.yml
   tags:
     - rally-install
 
-- include: rally_post_install.yml
+- include_tasks: rally_post_install.yml
   tags:
     - rally-config
 
-- include: rally_db_setup.yml
+- include_tasks: rally_db_setup.yml
   when: inventory_hostname == groups[rally_role_project_group][0]
   tags:
     - rally-config
diff --git a/tests/test.yml b/tests/test.yml
index 81d9766..7b8d9ea 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -15,16 +15,16 @@
 
 # Prepare the user ssh keys
 # 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 Rally
-- include: test-install-rally.yml
+- import_playbook: test-install-rally.yml
 
 # Functional testing of Rally Install
-- include: test-functional-rally.yml
+- import_playbook: test-functional-rally.yml