diff --git a/tasks/main.yml b/tasks/main.yml
index dac96cf..84253e4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -40,23 +40,23 @@
   tags:
     - always
 
-- include: tacker_pre_install.yml
+- include_tasks: tacker_pre_install.yml
   tags:
     - tacker-install
-- include: tacker_install.yml
+- include_tasks: tacker_install.yml
   tags:
     - tacker-install
 
-- include: tacker_install.yml
+- include_tasks: tacker_install.yml
   tags:
     - tacker-install
 
-- include: tacker_post_install.yml
+- include_tasks: tacker_post_install.yml
   tags:
     - tacker-install
     - tacker-config
 
-- include: tacker_init.yml
+- include_tasks: tacker_init.yml
   tags:
     - tacker-install
 
@@ -91,7 +91,7 @@
     - tacker-install
 
 #NOTE: comment for now
-#- include: tacker_horizon.yml
+#- include_tasks: tacker_horizon.yml
   #when: >
     #inventory_hostname == groups['tacker_all'][0]
   #tags:
diff --git a/tasks/tacker_init.yml b/tasks/tacker_init.yml
index 2146f7f..2549f1a 100644
--- a/tasks/tacker_init.yml
+++ b/tasks/tacker_init.yml
@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: tacker_init_common.yml
+- include_tasks: tacker_init_common.yml
   vars:
     program_name: "{{ tacker_program_name }}"
     service_name: "{{ tacker_service_name }}"
diff --git a/tasks/tacker_init_common.yml b/tasks/tacker_init_common.yml
index d2564e3..562e945 100644
--- a/tasks/tacker_init_common.yml
+++ b/tasks/tacker_init_common.yml
@@ -15,10 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: tacker_init_upstart.yml
+- include_tasks: tacker_init_upstart.yml
   when: pid1_name == "init"
 
-- include: tacker_init_systemd.yml
+- include_tasks: tacker_init_systemd.yml
   when: pid1_name == "systemd"
 
 - name: Load service
diff --git a/tests/test.yml b/tests/test.yml
index 675cb8e..987d490 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 Tacker
-- include: test-install-tacker.yml
+- import_playbook: test-install-tacker.yml
 
 # Test Tacker
-- include: test-tacker-functional.yml
+- import_playbook: test-tacker-functional.yml