diff --git a/tasks/main.yml b/tasks/main.yml
index 823438f..89ed84f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -39,11 +39,11 @@
   tags:
     - always
 
-- include: cloudkitty_pre_install.yml
-- include: cloudkitty_install.yml
-- include: cloudkitty_post_install.yml
+- include_tasks: cloudkitty_pre_install.yml
+- include_tasks: cloudkitty_install.yml
+- include_tasks: cloudkitty_post_install.yml
 
-- include: cloudkitty_service_setup.yml
+- include_tasks: cloudkitty_service_setup.yml
   when: inventory_hostname == groups['cloudkitty_all'][0]
 
 - import_tasks: mq_setup.yml
diff --git a/tests/test.yml b/tests/test.yml
index 8d6d5b5..b692e45 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -14,12 +14,12 @@
 # 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
 
-- include: test-install-cloudkitty.yml
+- import_playbook: test-install-cloudkitty.yml