diff --git a/tests/basic.yml b/tests/basic.yml
index 6d79eb8..8233a04 100644
--- a/tests/basic.yml
+++ b/tests/basic.yml
@@ -17,8 +17,8 @@
     # Test if we can install required packages
     - "{{req_pkg}}"
   tasks:
-  - include_tasks: shared-tasks/artifacts_test_env.yml
-  - include_tasks: shared-tasks/artifacts_test_runner.yml
+  - import_tasks: shared-tasks/artifacts_test_env.yml
+  - import_tasks: shared-tasks/artifacts_test_runner.yml
 
 # Make sure the role behaves correctly if test fails
 - hosts: localhost
@@ -33,6 +33,6 @@
     ignore_errors: yes
   tasks:
   # 'verify_failed_test' tasks should run after 'test-basic-fail'
-  - include_tasks: shared-tasks/verify_failed_test.yml
-  - include_tasks: shared-tasks/artifacts_test_env.yml
-  - include_tasks: shared-tasks/artifacts_test_runner.yml
+  - import_tasks: shared-tasks/verify_failed_test.yml
+  - import_tasks: shared-tasks/artifacts_test_env.yml
+  - import_tasks: shared-tasks/artifacts_test_runner.yml
diff --git a/tests/beakerlib.yml b/tests/beakerlib.yml
index a0a24f4..5f84bda 100644
--- a/tests/beakerlib.yml
+++ b/tests/beakerlib.yml
@@ -13,8 +13,8 @@
     required_packages:
     - "{{req_pkg}}"
   tasks:
-  - include_tasks: shared-tasks/artifacts_test_env.yml
-  - include_tasks: shared-tasks/artifacts_test_runner.yml
+  - import_tasks: shared-tasks/artifacts_test_env.yml
+  - import_tasks: shared-tasks/artifacts_test_runner.yml
 
 
 # Make sure the role behaves correctly if test fails
@@ -30,6 +30,6 @@
     ignore_errors: yes
   tasks:
   # 'tests_verify_failed_test' tasks should run after 'test-beakerlib-fail'
-  - include_tasks: shared-tasks/verify_failed_test.yml
-  - include_tasks: shared-tasks/artifacts_test_env.yml
-  - include_tasks: shared-tasks/artifacts_test_runner.yml
+  - import_tasks: shared-tasks/verify_failed_test.yml
+  - import_tasks: shared-tasks/artifacts_test_env.yml
+  - import_tasks: shared-tasks/artifacts_test_runner.yml
diff --git a/tests/prepare.yml b/tests/prepare.yml
index 20cc873..4cc4cce 100644
--- a/tests/prepare.yml
+++ b/tests/prepare.yml
@@ -5,9 +5,9 @@
     artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}"
     remote_artifacts: /tmp/artifacts/
   tasks:
-    - include_tasks: shared-tasks/artifacts.yml
+    - import_tasks: shared-tasks/artifacts.yml
       tags:
         - always
-    - include_tasks: shared-tasks/req-pkg.yml
+    - import_tasks: shared-tasks/req-pkg.yml
       tags:
         - always
diff --git a/tests/rhts.yml b/tests/rhts.yml
index 703ae01..d9b2ea8 100644
--- a/tests/rhts.yml
+++ b/tests/rhts.yml
@@ -12,8 +12,8 @@
     # Test if we can install required packages
     - "{{req_pkg}}"
   tasks:
-  - include_tasks: shared-tasks/artifacts_test_env.yml
-  - include_tasks: shared-tasks/artifacts_test_runner.yml
+  - import_tasks: shared-tasks/artifacts_test_env.yml
+  - import_tasks: shared-tasks/artifacts_test_runner.yml
 
 # Make sure the role behaves correctly if test fails
 - hosts: localhost
@@ -28,6 +28,6 @@
     ignore_errors: yes
   tasks:
   # 'verify_failed_test' tasks should run after 'testi-rhts-fail'
-  - include_tasks: shared-tasks/verify_failed_test.yml
-  - include_tasks: shared-tasks/artifacts_test_env.yml
-  - include_tasks: shared-tasks/artifacts_test_runner.yml
+  - import_tasks: shared-tasks/verify_failed_test.yml
+  - import_tasks: shared-tasks/artifacts_test_env.yml
+  - import_tasks: shared-tasks/artifacts_test_runner.yml
diff --git a/tests/shared-tasks/req-pkg.yml b/tests/shared-tasks/req-pkg.yml
index 2d39496..6dfa4a9 100644
--- a/tests/shared-tasks/req-pkg.yml
+++ b/tests/shared-tasks/req-pkg.yml
@@ -1,4 +1,4 @@
-- include_role:
+- import_role:
     name: str-common
     tasks_from: inspect.yml