diff --git a/test-install-infra.yml b/test-install-infra.yml
index 67828f71..8710f0bf 100644
--- a/test-install-infra.yml
+++ b/test-install-infra.yml
@@ -13,8 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: test-install-memcached.yml
+- import_playbook: test-install-memcached.yml
 
-- include: test-install-rabbitmq.yml
+- import_playbook: test-install-rabbitmq.yml
 
-- include: test-install-galera.yml
+- import_playbook: test-install-galera.yml
diff --git a/test-install-keystone.yml b/test-install-keystone.yml
index 9ae16fab..99f2f26f 100644
--- a/test-install-keystone.yml
+++ b/test-install-keystone.yml
@@ -35,7 +35,7 @@
     # config file changes which causes a container/service
     # restart do not cause an unexpected outage, we drain
     # the load balancer back end for this container.
-    - include: common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_state: disabled
       when:
@@ -46,7 +46,7 @@
     # Now that container changes are done, we can set
     # the load balancer back end for this container
     # to available again.
-    - include: common-tasks/haproxy-endpoint-manage.yml
+    - include_tasks: common-tasks/haproxy-endpoint-manage.yml
       vars:
         haproxy_state: enabled
       when:
diff --git a/test-install-neutron.yml b/test-install-neutron.yml
index 2eb7eaf9..f62df6b5 100644
--- a/test-install-neutron.yml
+++ b/test-install-neutron.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: setting-nodepool-variables.yml
+- import_playbook: setting-nodepool-variables.yml
 
 - name: Make /lib/modules accessible on neutron_agent containers
   hosts: neutron_agent
diff --git a/test-install-nova.yml b/test-install-nova.yml
index 863a636c..f3b32575 100644
--- a/test-install-nova.yml
+++ b/test-install-nova.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: setting-nodepool-variables.yml
+- import_playbook: setting-nodepool-variables.yml
 
 - name: Prepare for nova services
   hosts: nova_all
diff --git a/test-install-swift.yml b/test-install-swift.yml
index a41737dd..c9d63de8 100644
--- a/test-install-swift.yml
+++ b/test-install-swift.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: test-setup-swifthosts.yml
+- import_playbook: test-setup-swifthosts.yml
 
 - name: Playbook for deploying swift
   hosts: "{{ swift_groups | default('swift_all:swift_remote_all') }}"
diff --git a/test-prepare-containers.yml b/test-prepare-containers.yml
index 04e7c279..76798d4e 100644
--- a/test-prepare-containers.yml
+++ b/test-prepare-containers.yml
@@ -23,9 +23,9 @@
   become: yes
   gather_facts: true
   tasks:
-    - include: "common-tasks/test-set-nodepool-vars.yml"
+    - include_tasks: "common-tasks/test-set-nodepool-vars.yml"
 
-- include: destroy_containers.yml
+- import_playbook: destroy_containers.yml
   when: destroy_first | default(True) | bool
 
 - name: Playbook for creating containers
@@ -62,7 +62,7 @@
   remote_user: root
   gather_facts: true
   pre_tasks:
-    - include: "common-tasks/test-set-nodepool-vars.yml"
+    - include_tasks: "common-tasks/test-set-nodepool-vars.yml"
   roles:
     - role: "openstack_hosts"
   vars_files:
diff --git a/test-prepare-host.yml b/test-prepare-host.yml
index 0d64b702..c0147ee2 100644
--- a/test-prepare-host.yml
+++ b/test-prepare-host.yml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: test-repo-setup.yml
+- import_playbook: test-repo-setup.yml
 
 - name: Playbook for configuring hosts
   hosts: localhost
@@ -26,7 +26,7 @@
   vars_files:
     - test-vars.yml
   tasks:
-    - include: "common-tasks/test-set-nodepool-vars.yml"
+    - include_tasks: "common-tasks/test-set-nodepool-vars.yml"
 
     - name: Clear iptables rules
       shell: "{{ playbook_dir }}/iptables-clear.sh"
@@ -83,7 +83,7 @@
         openrc_openstack_client_config_dir_owner: "root"
         openrc_clouds_yml_file_owner: "root"
 
-- include: test-install-openstack-hosts.yml
+- import_playbook: test-install-openstack-hosts.yml
 
 - name: Playbook for configuring the LXC host
   hosts: localhost
diff --git a/test-setup-host.yml b/test-setup-host.yml
index 395c1a5c..5d28c415 100644
--- a/test-setup-host.yml
+++ b/test-setup-host.yml
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 # Prepare the user ssh keys
-- include: test-prepare-keys.yml
+- import_playbook: test-prepare-keys.yml
 
 # Prepare the host
-- include: test-prepare-host.yml
+- import_playbook: test-prepare-host.yml
 
 # Prepare the containers
-- include: test-prepare-containers.yml
+- import_playbook: test-prepare-containers.yml
diff --git a/tests/test.yml b/tests/test.yml
index e914835f..c1a1fcc2 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -14,19 +14,19 @@
 # limitations under the License.
 
 # Prepare the user ssh keys
-- include: common/test-prepare-keys.yml
+- import_playbook: common/test-prepare-keys.yml
 
 # Prepare the host
-- include: common/test-prepare-host.yml
+- import_playbook: common/test-prepare-host.yml
 
 # Prepare the containers
-- include: common/test-prepare-containers.yml
+- import_playbook: common/test-prepare-containers.yml
 
 # Install RabbitMQ/MariaDB/Memcached
-- 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 Tempest
-- include: common/test-install-tempest.yml
+- import_playbook: common/test-install-tempest.yml