263 files changed, 53 insertions, 53 deletions

diff --git a/test/integration/Makefile b/test/integration/Makefile
index 207a20f4d4..c52c072729 100644
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@@ -64,7 +64,7 @@ environment:
 	(cd targets/environment && ./runme.sh $(TEST_FLAGS))
 
 non_destructive: setup
-	ansible-playbook non_destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook non_destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
 
 # Tests which can be run when running as root and a local SSH daemon is available.
 test_root_ssh: test_connection_local test_connection_chroot test_connection_ssh test_connection_paramiko_ssh test_delegate_to
@@ -135,7 +135,7 @@ test_connection_winrm:
 	(cd targets/connection_winrm && ./runme.sh $(TEST_FLAGS))
 
 destructive: setup
-	ansible-playbook destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
+	ANSIBLE_ROLES_PATH=targets ansible-playbook destructive.yml -i $(INVENTORY) -e outputdir=$(TEST_DIR) -e @$(VARS_FILE) $(CREDENTIALS_ARG) -v $(TEST_FLAGS)
 
 check_mode:
 	(cd targets/check_mode && ./runme.sh $(TEST_FLAGS))
diff --git a/test/integration/destructive.yml b/test/integration/destructive.yml
index ee858e01e1..ad03a6efdf 100644
--- a/test/integration/destructive.yml
+++ b/test/integration/destructive.yml
@@ -2,22 +2,22 @@
   gather_facts: True
   roles:
     # In destructive because it creates and removes a user
-    - { role: test_become, tags: test_become}
-    - { role: test_service, tags: [test_service, needs_privileged] }
-    - { role: test_pip, tags: test_pip }
-    - { role: test_gem, tags: test_gem }
-    - { role: test_yum, tags: test_yum }
-    - { role: test_apt, tags: test_apt }
-    - { role: test_apt_repository, tags: [test_apt_repository, test_apt_key] }
-    - { role: test_postgresql, tags: [test_postgresql, test_postgresql_db, test_postgresql_privs, test_postgresql_user, needs_privileged] }
-    - { role: test_mysql_db, tags: test_mysql_db}
-    - { role: test_mysql_user, tags: test_mysql_user}
-    - { role: test_mysql_variables, tags: test_mysql_variables}
-    - { role: test_docker, tags: test_docker }
-    - { role: test_zypper, tags: test_zypper}
-    - { role: test_zypper_repository, tags: test_zypper_repository}
-    - { role: test_uri, tags: test_uri }
-    - { role: test_get_url, tags: test_get_url }
-    - { role: test_apache2_module, tags: test_apache2_module }
+    - { role: become, tags: test_become}
+    - { role: service, tags: [test_service, needs_privileged] }
+    - { role: pip, tags: test_pip }
+    - { role: gem, tags: test_gem }
+    - { role: yum, tags: test_yum }
+    - { role: apt, tags: test_apt }
+    - { role: apt_repository, tags: [test_apt_repository, test_apt_key] }
+    - { role: postgresql, tags: [test_postgresql, test_postgresql_db, test_postgresql_privs, test_postgresql_user, needs_privileged] }
+    - { role: mysql_db, tags: test_mysql_db}
+    - { role: mysql_user, tags: test_mysql_user}
+    - { role: mysql_variables, tags: test_mysql_variables}
+    - { role: docker, tags: test_docker }
+    - { role: zypper, tags: test_zypper}
+    - { role: zypper_repository, tags: test_zypper_repository}
+    - { role: uri, tags: test_uri }
+    - { role: get_url, tags: test_get_url }
+    - { role: apache2_module, tags: test_apache2_module }
     # This removes ~/.ssh/known_hosts and /etc/ssh/known_hosts
-    - { role: test_git, tags: test_git }
+    - { role: git, tags: test_git }
diff --git a/test/integration/non_destructive.yml b/test/integration/non_destructive.yml
index 11caccbf90..e44bcdae72 100644
--- a/test/integration/non_destructive.yml
+++ b/test/integration/non_destructive.yml
@@ -1,36 +1,36 @@
 - hosts: testhost
   gather_facts: True
   roles: 
-    - { role: test_ping, tags: test_ping }
-    - { role: test_special_vars, tags: test_special_vars }
-    - { role: test_ignore_errors, tags: test_ignore_errors }
-    - { role: test_conditionals, tags: test_conditionals }
-    - { role: test_iterators, tags: test_iterators }
-    - { role: test_lookups, tags: test_lookups }
-    - { role: test_changed_when, tags: test_changed_when }
-    - { role: test_failed_when, tags: test_failed_when }
-    - { role: test_until, tags: test_until }
-    - { role: test_copy, tags: test_copy }
-    - { role: test_stat, tags: test_stat }
-    - { role: test_template, tags: test_template }
-    - { role: test_file, tags: test_file }
-    - { role: test_fetch, tags: test_fetch }
-    - { role: test_synchronize, tags: test_synchronize }
-    - { role: test_assemble, tags: test_assemble }
-    - { role: test_subversion, tags: test_subversion }
-    - { role: test_hg, tags: test_hg }
-    - { role: test_lineinfile, tags: test_lineinfile }
-    - { role: test_unarchive, tags: test_unarchive }
-    - { role: test_filters, tags: test_filters }
-    - { role: test_facts_d, tags: test_facts_d }
-    - { role: test_async, tags: [test_async, test_async_status, test_async_wrapper] }
-    - { role: test_command_shell, tags: [test_command_shell, test_command, test_shell] }
-    - { role: test_task_ordering, tags: test_task_ordering }
-    - { role: test_script, tags: test_script }
-    - { role: test_authorized_key, tags: test_authorized_key }
-    - { role: test_embedded_module, tags: test_embedded_module }
-    - { role: test_add_host, tags: test_add_host }
-    - { role: test_binary, tags: test_binary }
-    - { role: test_loops, tags: test_loops }
-    - { role: test_mount, tags: [test_mount, needs_root, needs_privileged]}
-    - { role: test_include_vars, tags: test_include_vars }
+    - { role: ping, tags: test_ping }
+    - { role: special_vars, tags: test_special_vars }
+    - { role: ignore_errors, tags: test_ignore_errors }
+    - { role: conditionals, tags: test_conditionals }
+    - { role: iterators, tags: test_iterators }
+    - { role: lookups, tags: test_lookups }
+    - { role: changed_when, tags: test_changed_when }
+    - { role: failed_when, tags: test_failed_when }
+    - { role: until, tags: test_until }
+    - { role: copy, tags: test_copy }
+    - { role: stat, tags: test_stat }
+    - { role: template, tags: test_template }
+    - { role: file, tags: test_file }
+    - { role: fetch, tags: test_fetch }
+    - { role: synchronize, tags: test_synchronize }
+    - { role: assemble, tags: test_assemble }
+    - { role: subversion, tags: test_subversion }
+    - { role: hg, tags: test_hg }
+    - { role: lineinfile, tags: test_lineinfile }
+    - { role: unarchive, tags: test_unarchive }
+    - { role: filters, tags: test_filters }
+    - { role: facts_d, tags: test_facts_d }
+    - { role: async, tags: [test_async, test_async_status, test_async_wrapper] }
+    - { role: command_shell, tags: [test_command_shell, test_command, test_shell] }
+    - { role: task_ordering, tags: test_task_ordering }
+    - { role: script, tags: test_script }
+    - { role: authorized_key, tags: test_authorized_key }
+    - { role: embedded_module, tags: test_embedded_module }
+    - { role: add_host, tags: test_add_host }
+    - { role: binary, tags: test_binary }
+    - { role: loops, tags: test_loops }
+    - { role: mount, tags: [test_mount, needs_root, needs_privileged]}
+    - { role: include_vars, tags: test_include_vars }
diff --git a/test/integration/roles/test_add_host/tasks/main.yml b/test/integration/targets/add_host/tasks/main.yml
index cafd6bd4eb..cafd6bd4eb 100644
--- a/test/integration/roles/test_add_host/tasks/main.yml
+++ b/test/integration/targets/add_host/tasks/main.yml
diff --git a/test/integration/roles/test_apache2_module/meta/main.yml b/test/integration/targets/apache2_module/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_apache2_module/meta/main.yml
+++ b/test/integration/targets/apache2_module/meta/main.yml
diff --git a/test/integration/roles/test_apache2_module/tasks/actualtest.yml b/test/integration/targets/apache2_module/tasks/actualtest.yml
index 5b02a1c2ff..5b02a1c2ff 100644
--- a/test/integration/roles/test_apache2_module/tasks/actualtest.yml
+++ b/test/integration/targets/apache2_module/tasks/actualtest.yml
diff --git a/test/integration/roles/test_apache2_module/tasks/main.yml b/test/integration/targets/apache2_module/tasks/main.yml
index 590fc726e3..590fc726e3 100644
--- a/test/integration/roles/test_apache2_module/tasks/main.yml
+++ b/test/integration/targets/apache2_module/tasks/main.yml
diff --git a/test/integration/roles/test_apt/meta/main.yml b/test/integration/targets/apt/meta/main.yml
index 07faa21776..07faa21776 100644
--- a/test/integration/roles/test_apt/meta/main.yml
+++ b/test/integration/targets/apt/meta/main.yml
diff --git a/test/integration/roles/test_apt/tasks/apt-builddep.yml b/test/integration/targets/apt/tasks/apt-builddep.yml
index e3f9357b12..e3f9357b12 100644
--- a/test/integration/roles/test_apt/tasks/apt-builddep.yml
+++ b/test/integration/targets/apt/tasks/apt-builddep.yml
diff --git a/test/integration/roles/test_apt/tasks/apt.yml b/test/integration/targets/apt/tasks/apt.yml
index d293f845fa..d293f845fa 100644
--- a/test/integration/roles/test_apt/tasks/apt.yml
+++ b/test/integration/targets/apt/tasks/apt.yml
diff --git a/test/integration/roles/test_apt/tasks/main.yml b/test/integration/targets/apt/tasks/main.yml
index 552b543d2d..552b543d2d 100644
--- a/test/integration/roles/test_apt/tasks/main.yml
+++ b/test/integration/targets/apt/tasks/main.yml
diff --git a/test/integration/roles/test_apt_repository/meta/main.yml b/test/integration/targets/apt_repository/meta/main.yml
index 07faa21776..07faa21776 100644
--- a/test/integration/roles/test_apt_repository/meta/main.yml
+++ b/test/integration/targets/apt_repository/meta/main.yml
diff --git a/test/integration/roles/test_apt_repository/tasks/apt.yml b/test/integration/targets/apt_repository/tasks/apt.yml
index 4295badb16..4295badb16 100644
--- a/test/integration/roles/test_apt_repository/tasks/apt.yml
+++ b/test/integration/targets/apt_repository/tasks/apt.yml
diff --git a/test/integration/roles/test_apt_repository/tasks/cleanup.yml b/test/integration/targets/apt_repository/tasks/cleanup.yml
index 86a09dd5ae..86a09dd5ae 100644
--- a/test/integration/roles/test_apt_repository/tasks/cleanup.yml
+++ b/test/integration/targets/apt_repository/tasks/cleanup.yml
diff --git a/test/integration/roles/test_apt_repository/tasks/main.yml b/test/integration/targets/apt_repository/tasks/main.yml
index 38ae8f0447..38ae8f0447 100644
--- a/test/integration/roles/test_apt_repository/tasks/main.yml
+++ b/test/integration/targets/apt_repository/tasks/main.yml
diff --git a/test/integration/roles/test_assemble/files/fragment1 b/test/integration/targets/assemble/files/fragment1
index a00d3ea04a..a00d3ea04a 100644
--- a/test/integration/roles/test_assemble/files/fragment1
+++ b/test/integration/targets/assemble/files/fragment1
diff --git a/test/integration/roles/test_assemble/files/fragment2 b/test/integration/targets/assemble/files/fragment2
index 860f760388..860f760388 100644
--- a/test/integration/roles/test_assemble/files/fragment2
+++ b/test/integration/targets/assemble/files/fragment2
diff --git a/test/integration/roles/test_assemble/files/fragment3 b/test/integration/targets/assemble/files/fragment3
index df95b24bb6..df95b24bb6 100644
--- a/test/integration/roles/test_assemble/files/fragment3
+++ b/test/integration/targets/assemble/files/fragment3
diff --git a/test/integration/roles/test_assemble/files/fragment4 b/test/integration/targets/assemble/files/fragment4
index c83252bb8e..c83252bb8e 100644
--- a/test/integration/roles/test_assemble/files/fragment4
+++ b/test/integration/targets/assemble/files/fragment4
diff --git a/test/integration/roles/test_assemble/files/fragment5 b/test/integration/targets/assemble/files/fragment5
index 8a527d15f7..8a527d15f7 100644
--- a/test/integration/roles/test_assemble/files/fragment5
+++ b/test/integration/targets/assemble/files/fragment5
diff --git a/test/integration/roles/test_assemble/meta/main.yml b/test/integration/targets/assemble/meta/main.yml
index a9d0b4681e..a9d0b4681e 100644
--- a/test/integration/roles/test_assemble/meta/main.yml
+++ b/test/integration/targets/assemble/meta/main.yml
diff --git a/test/integration/roles/test_assemble/tasks/main.yml b/test/integration/targets/assemble/tasks/main.yml
index d0c1f15e56..d0c1f15e56 100644
--- a/test/integration/roles/test_assemble/tasks/main.yml
+++ b/test/integration/targets/assemble/tasks/main.yml
diff --git a/test/integration/roles/test_async/library/async_test.py b/test/integration/targets/async/library/async_test.py
index 5c77a27c8d..5c77a27c8d 100644
--- a/test/integration/roles/test_async/library/async_test.py
+++ b/test/integration/targets/async/library/async_test.py
diff --git a/test/integration/roles/test_async/meta/main.yml b/test/integration/targets/async/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_async/meta/main.yml
+++ b/test/integration/targets/async/meta/main.yml
diff --git a/test/integration/roles/test_async/tasks/main.yml b/test/integration/targets/async/tasks/main.yml
index c6739dc256..c6739dc256 100644
--- a/test/integration/roles/test_async/tasks/main.yml
+++ b/test/integration/targets/async/tasks/main.yml
diff --git a/test/integration/roles/test_authorized_key/defaults/main.yml b/test/integration/targets/authorized_key/defaults/main.yml
index e3a7606e01..e3a7606e01 100644
--- a/test/integration/roles/test_authorized_key/defaults/main.yml
+++ b/test/integration/targets/authorized_key/defaults/main.yml
diff --git a/test/integration/roles/test_authorized_key/meta/main.yml b/test/integration/targets/authorized_key/meta/main.yml
index 145d4f7ca1..145d4f7ca1 100644
--- a/test/integration/roles/test_authorized_key/meta/main.yml
+++ b/test/integration/targets/authorized_key/meta/main.yml
diff --git a/test/integration/roles/test_authorized_key/tasks/main.yml b/test/integration/targets/authorized_key/tasks/main.yml
index 9b2c245082..9b2c245082 100644
--- a/test/integration/roles/test_authorized_key/tasks/main.yml
+++ b/test/integration/targets/authorized_key/tasks/main.yml
diff --git a/test/integration/roles/test_become/files/baz.txt b/test/integration/targets/become/files/baz.txt
index b8d834daa4..b8d834daa4 100644
--- a/test/integration/roles/test_become/files/baz.txt
+++ b/test/integration/targets/become/files/baz.txt
diff --git a/test/integration/roles/test_become/tasks/main.yml b/test/integration/targets/become/tasks/main.yml
index 86462d4eea..86462d4eea 100644
--- a/test/integration/roles/test_become/tasks/main.yml
+++ b/test/integration/targets/become/tasks/main.yml
diff --git a/test/integration/roles/test_become/templates/bar.j2 b/test/integration/targets/become/templates/bar.j2
index 7c5fe0ab49..7c5fe0ab49 100644
--- a/test/integration/roles/test_become/templates/bar.j2
+++ b/test/integration/targets/become/templates/bar.j2
diff --git a/test/integration/roles/test_become/vars/default.yml b/test/integration/targets/become/vars/default.yml
index 223d44ed24..223d44ed24 100644
--- a/test/integration/roles/test_become/vars/default.yml
+++ b/test/integration/targets/become/vars/default.yml
diff --git a/test/integration/roles/test_binary/files/b64_latin1 b/test/integration/targets/binary/files/b64_latin1
index c7fbdeb632..c7fbdeb632 100644
--- a/test/integration/roles/test_binary/files/b64_latin1
+++ b/test/integration/targets/binary/files/b64_latin1
diff --git a/test/integration/roles/test_binary/files/b64_utf8 b/test/integration/targets/binary/files/b64_utf8
index c7fbdeb632..c7fbdeb632 100644
--- a/test/integration/roles/test_binary/files/b64_utf8
+++ b/test/integration/targets/binary/files/b64_utf8
diff --git a/test/integration/roles/test_binary/files/from_playbook b/test/integration/targets/binary/files/from_playbook
index c7fbdeb632..c7fbdeb632 100644
--- a/test/integration/roles/test_binary/files/from_playbook
+++ b/test/integration/targets/binary/files/from_playbook
diff --git a/test/integration/roles/test_binary/meta/main.yml b/test/integration/targets/binary/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_binary/meta/main.yml
+++ b/test/integration/targets/binary/meta/main.yml
diff --git a/test/integration/roles/test_binary/tasks/main.yml b/test/integration/targets/binary/tasks/main.yml
index 486ee6d6b0..486ee6d6b0 100644
--- a/test/integration/roles/test_binary/tasks/main.yml
+++ b/test/integration/targets/binary/tasks/main.yml
diff --git a/test/integration/roles/test_binary/templates/b64_latin1_template.j2 b/test/integration/targets/binary/templates/b64_latin1_template.j2
index ee2fc1b19c..ee2fc1b19c 100644
--- a/test/integration/roles/test_binary/templates/b64_latin1_template.j2
+++ b/test/integration/targets/binary/templates/b64_latin1_template.j2
diff --git a/test/integration/roles/test_binary/templates/b64_utf8_template.j2 b/test/integration/targets/binary/templates/b64_utf8_template.j2
index 9fd3ed48b1..9fd3ed48b1 100644
--- a/test/integration/roles/test_binary/templates/b64_utf8_template.j2
+++ b/test/integration/targets/binary/templates/b64_utf8_template.j2
diff --git a/test/integration/roles/test_binary/templates/from_playbook_template.j2 b/test/integration/targets/binary/templates/from_playbook_template.j2
index 3be6dd4f0b..3be6dd4f0b 100644
--- a/test/integration/roles/test_binary/templates/from_playbook_template.j2
+++ b/test/integration/targets/binary/templates/from_playbook_template.j2
diff --git a/test/integration/roles/test_binary/vars/main.yml b/test/integration/targets/binary/vars/main.yml
index f6d40232c3..f6d40232c3 100644
--- a/test/integration/roles/test_binary/vars/main.yml
+++ b/test/integration/targets/binary/vars/main.yml
diff --git a/test/integration/roles/test_changed_when/meta/main.yml b/test/integration/targets/changed_when/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_changed_when/meta/main.yml
+++ b/test/integration/targets/changed_when/meta/main.yml
diff --git a/test/integration/roles/test_changed_when/tasks/main.yml b/test/integration/targets/changed_when/tasks/main.yml
index 0e87b90340..0e87b90340 100644
--- a/test/integration/roles/test_changed_when/tasks/main.yml
+++ b/test/integration/targets/changed_when/tasks/main.yml
diff --git a/test/integration/roles/test_command_shell/files/create_afile.sh b/test/integration/targets/command_shell/files/create_afile.sh
index e6fae448b2..e6fae448b2 100755
--- a/test/integration/roles/test_command_shell/files/create_afile.sh
+++ b/test/integration/targets/command_shell/files/create_afile.sh
diff --git a/test/integration/roles/test_command_shell/files/remove_afile.sh b/test/integration/targets/command_shell/files/remove_afile.sh
index 4a7fea6617..4a7fea6617 100755
--- a/test/integration/roles/test_command_shell/files/remove_afile.sh
+++ b/test/integration/targets/command_shell/files/remove_afile.sh
diff --git a/test/integration/roles/test_command_shell/files/test.sh b/test/integration/targets/command_shell/files/test.sh
index ade17e9b8c..ade17e9b8c 100755
--- a/test/integration/roles/test_command_shell/files/test.sh
+++ b/test/integration/targets/command_shell/files/test.sh
diff --git a/test/integration/roles/test_command_shell/meta/main.yml b/test/integration/targets/command_shell/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_command_shell/meta/main.yml
+++ b/test/integration/targets/command_shell/meta/main.yml
diff --git a/test/integration/roles/test_command_shell/tasks/main.yml b/test/integration/targets/command_shell/tasks/main.yml
index 226f8df622..226f8df622 100644
--- a/test/integration/roles/test_command_shell/tasks/main.yml
+++ b/test/integration/targets/command_shell/tasks/main.yml
diff --git a/test/integration/roles/test_conditionals/tasks/main.yml b/test/integration/targets/conditionals/tasks/main.yml
index 0908b910fb..0908b910fb 100644
--- a/test/integration/roles/test_conditionals/tasks/main.yml
+++ b/test/integration/targets/conditionals/tasks/main.yml
diff --git a/test/integration/roles/test_conditionals/vars/main.yml b/test/integration/targets/conditionals/vars/main.yml
index a02b87168e..a02b87168e 100644
--- a/test/integration/roles/test_conditionals/vars/main.yml
+++ b/test/integration/targets/conditionals/vars/main.yml
diff --git a/test/integration/roles/test_copy/files/foo.txt b/test/integration/targets/copy/files/foo.txt
index 7c6ded14ec..7c6ded14ec 100644
--- a/test/integration/roles/test_copy/files/foo.txt
+++ b/test/integration/targets/copy/files/foo.txt
diff --git a/test/integration/roles/test_copy/files/subdir/bar.txt b/test/integration/targets/copy/files/subdir/bar.txt
index 76018072e0..76018072e0 100644
--- a/test/integration/roles/test_copy/files/subdir/bar.txt
+++ b/test/integration/targets/copy/files/subdir/bar.txt
diff --git a/test/integration/roles/test_copy/files/subdir/subdir2/baz.txt b/test/integration/targets/copy/files/subdir/subdir2/baz.txt
index 76018072e0..76018072e0 100644
--- a/test/integration/roles/test_copy/files/subdir/subdir2/baz.txt
+++ b/test/integration/targets/copy/files/subdir/subdir2/baz.txt
diff --git a/test/integration/roles/test_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt b/test/integration/targets/copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
index 78df5b06bd..78df5b06bd 100644
--- a/test/integration/roles/test_copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
+++ b/test/integration/targets/copy/files/subdir/subdir2/subdir3/subdir4/qux.txt
diff --git a/test/integration/roles/test_copy/meta/main.yml b/test/integration/targets/copy/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_copy/meta/main.yml
+++ b/test/integration/targets/copy/meta/main.yml
diff --git a/test/integration/roles/test_copy/tasks/main.yml b/test/integration/targets/copy/tasks/main.yml
index 128c0a793e..128c0a793e 100644
--- a/test/integration/roles/test_copy/tasks/main.yml
+++ b/test/integration/targets/copy/tasks/main.yml
diff --git a/test/integration/roles/test_docker/files/devdockerCA.crt b/test/integration/targets/docker/files/devdockerCA.crt
index 14f1b2f7ee..14f1b2f7ee 100644
--- a/test/integration/roles/test_docker/files/devdockerCA.crt
+++ b/test/integration/targets/docker/files/devdockerCA.crt
diff --git a/test/integration/roles/test_docker/files/devdockerCA.key b/test/integration/targets/docker/files/devdockerCA.key
index 0c8c0ee7b0..0c8c0ee7b0 100644
--- a/test/integration/roles/test_docker/files/devdockerCA.key
+++ b/test/integration/targets/docker/files/devdockerCA.key
diff --git a/test/integration/roles/test_docker/files/devdockerCA.srl b/test/integration/targets/docker/files/devdockerCA.srl
index 78f0162afe..78f0162afe 100644
--- a/test/integration/roles/test_docker/files/devdockerCA.srl
+++ b/test/integration/targets/docker/files/devdockerCA.srl
diff --git a/test/integration/roles/test_docker/files/docker-registry.htpasswd b/test/integration/targets/docker/files/docker-registry.htpasswd
index 7cee295817..7cee295817 100644
--- a/test/integration/roles/test_docker/files/docker-registry.htpasswd
+++ b/test/integration/targets/docker/files/docker-registry.htpasswd
diff --git a/test/integration/roles/test_docker/files/dockertest.ansible.com.crt b/test/integration/targets/docker/files/dockertest.ansible.com.crt
index e89327c3fa..e89327c3fa 100644
--- a/test/integration/roles/test_docker/files/dockertest.ansible.com.crt
+++ b/test/integration/targets/docker/files/dockertest.ansible.com.crt
diff --git a/test/integration/roles/test_docker/files/dockertest.ansible.com.csr b/test/integration/targets/docker/files/dockertest.ansible.com.csr
index 62b1f8535a..62b1f8535a 100644
--- a/test/integration/roles/test_docker/files/dockertest.ansible.com.csr
+++ b/test/integration/targets/docker/files/dockertest.ansible.com.csr
diff --git a/test/integration/roles/test_docker/files/dockertest.ansible.com.key b/test/integration/targets/docker/files/dockertest.ansible.com.key
index bda2bb6126..bda2bb6126 100644
--- a/test/integration/roles/test_docker/files/dockertest.ansible.com.key
+++ b/test/integration/targets/docker/files/dockertest.ansible.com.key
diff --git a/test/integration/roles/test_docker/files/nginx-docker-registry.conf b/test/integration/targets/docker/files/nginx-docker-registry.conf
index 99c7802e1b..99c7802e1b 100644
--- a/test/integration/roles/test_docker/files/nginx-docker-registry.conf
+++ b/test/integration/targets/docker/files/nginx-docker-registry.conf
diff --git a/test/integration/roles/test_docker/meta/main.yml b/test/integration/targets/docker/meta/main.yml
index 399f3fb6e7..399f3fb6e7 100644
--- a/test/integration/roles/test_docker/meta/main.yml
+++ b/test/integration/targets/docker/meta/main.yml
diff --git a/test/integration/roles/test_docker/tasks/docker-setup-debian.yml b/test/integration/targets/docker/tasks/docker-setup-debian.yml
index 068011a093..068011a093 100644
--- a/test/integration/roles/test_docker/tasks/docker-setup-debian.yml
+++ b/test/integration/targets/docker/tasks/docker-setup-debian.yml
diff --git a/test/integration/roles/test_docker/tasks/docker-setup-rht.yml b/test/integration/targets/docker/tasks/docker-setup-rht.yml
index c25821c3be..c25821c3be 100644
--- a/test/integration/roles/test_docker/tasks/docker-setup-rht.yml
+++ b/test/integration/targets/docker/tasks/docker-setup-rht.yml
diff --git a/test/integration/roles/test_docker/tasks/docker-tests.yml b/test/integration/targets/docker/tasks/docker-tests.yml
index 14e23f72dd..14e23f72dd 100644
--- a/test/integration/roles/test_docker/tasks/docker-tests.yml
+++ b/test/integration/targets/docker/tasks/docker-tests.yml
diff --git a/test/integration/roles/test_docker/tasks/main.yml b/test/integration/targets/docker/tasks/main.yml
index 3689599523..3689599523 100644
--- a/test/integration/roles/test_docker/tasks/main.yml
+++ b/test/integration/targets/docker/tasks/main.yml
diff --git a/test/integration/roles/test_docker/tasks/registry-tests.yml b/test/integration/targets/docker/tasks/registry-tests.yml
index 1ef330da5f..1ef330da5f 100644
--- a/test/integration/roles/test_docker/tasks/registry-tests.yml
+++ b/test/integration/targets/docker/tasks/registry-tests.yml
diff --git a/test/integration/roles/test_embedded_module/library/test_integration_module b/test/integration/targets/embedded_module/library/test_integration_module
index f564619470..f564619470 100644
--- a/test/integration/roles/test_embedded_module/library/test_integration_module
+++ b/test/integration/targets/embedded_module/library/test_integration_module
diff --git a/test/integration/roles/test_embedded_module/tasks/main.yml b/test/integration/targets/embedded_module/tasks/main.yml
index 6a6d6485fc..6a6d6485fc 100644
--- a/test/integration/roles/test_embedded_module/tasks/main.yml
+++ b/test/integration/targets/embedded_module/tasks/main.yml
diff --git a/test/integration/roles/test_facts_d/meta/main.yml b/test/integration/targets/facts_d/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_facts_d/meta/main.yml
+++ b/test/integration/targets/facts_d/meta/main.yml
diff --git a/test/integration/roles/test_facts_d/tasks/main.yml b/test/integration/targets/facts_d/tasks/main.yml
index 3b5bba4075..3b5bba4075 100644
--- a/test/integration/roles/test_facts_d/tasks/main.yml
+++ b/test/integration/targets/facts_d/tasks/main.yml
diff --git a/test/integration/roles/test_failed_when/tasks/main.yml b/test/integration/targets/failed_when/tasks/main.yml
index 4a5617e142..4a5617e142 100644
--- a/test/integration/roles/test_failed_when/tasks/main.yml
+++ b/test/integration/targets/failed_when/tasks/main.yml
diff --git a/test/integration/roles/test_fetch/meta/main.yml b/test/integration/targets/fetch/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_fetch/meta/main.yml
+++ b/test/integration/targets/fetch/meta/main.yml
diff --git a/test/integration/roles/test_fetch/tasks/main.yml b/test/integration/targets/fetch/tasks/main.yml
index 4b6fb611e2..4b6fb611e2 100644
--- a/test/integration/roles/test_fetch/tasks/main.yml
+++ b/test/integration/targets/fetch/tasks/main.yml
diff --git a/test/integration/roles/test_file/files/foo.txt b/test/integration/targets/file/files/foo.txt
index 7c6ded14ec..7c6ded14ec 100644
--- a/test/integration/roles/test_file/files/foo.txt
+++ b/test/integration/targets/file/files/foo.txt
diff --git a/test/integration/roles/test_file/files/foobar/directory/fileC b/test/integration/targets/file/files/foobar/directory/fileC
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_file/files/foobar/directory/fileC
+++ b/test/integration/targets/file/files/foobar/directory/fileC
diff --git a/test/integration/roles/test_file/files/foobar/directory/fileD b/test/integration/targets/file/files/foobar/directory/fileD
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_file/files/foobar/directory/fileD
+++ b/test/integration/targets/file/files/foobar/directory/fileD
diff --git a/test/integration/roles/test_file/files/foobar/fileA b/test/integration/targets/file/files/foobar/fileA
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_file/files/foobar/fileA
+++ b/test/integration/targets/file/files/foobar/fileA
diff --git a/test/integration/roles/test_file/files/foobar/fileB b/test/integration/targets/file/files/foobar/fileB
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_file/files/foobar/fileB
+++ b/test/integration/targets/file/files/foobar/fileB
diff --git a/test/integration/roles/test_file/meta/main.yml b/test/integration/targets/file/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_file/meta/main.yml
+++ b/test/integration/targets/file/meta/main.yml
diff --git a/test/integration/roles/test_file/tasks/main.yml b/test/integration/targets/file/tasks/main.yml
index c6cbd6f6ad..c6cbd6f6ad 100644
--- a/test/integration/roles/test_file/tasks/main.yml
+++ b/test/integration/targets/file/tasks/main.yml
diff --git a/test/integration/roles/test_file/tasks/selinux_tests.yml b/test/integration/targets/file/tasks/selinux_tests.yml
index b0f6e17de2..b0f6e17de2 100644
--- a/test/integration/roles/test_file/tasks/selinux_tests.yml
+++ b/test/integration/targets/file/tasks/selinux_tests.yml
diff --git a/test/integration/roles/test_filters/files/9851.txt b/test/integration/targets/filters/files/9851.txt
index 70b12793e1..70b12793e1 100644
--- a/test/integration/roles/test_filters/files/9851.txt
+++ b/test/integration/targets/filters/files/9851.txt
diff --git a/test/integration/roles/test_filters/files/foo.txt b/test/integration/targets/filters/files/foo.txt
index c5af545d3a..c5af545d3a 100644
--- a/test/integration/roles/test_filters/files/foo.txt
+++ b/test/integration/targets/filters/files/foo.txt
diff --git a/test/integration/roles/test_filters/meta/main.yml b/test/integration/targets/filters/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_filters/meta/main.yml
+++ b/test/integration/targets/filters/meta/main.yml
diff --git a/test/integration/roles/test_filters/tasks/main.yml b/test/integration/targets/filters/tasks/main.yml
index 03566220e5..03566220e5 100644
--- a/test/integration/roles/test_filters/tasks/main.yml
+++ b/test/integration/targets/filters/tasks/main.yml
diff --git a/test/integration/roles/test_filters/templates/foo.j2 b/test/integration/targets/filters/templates/foo.j2
index cf592f98cc..cf592f98cc 100644
--- a/test/integration/roles/test_filters/templates/foo.j2
+++ b/test/integration/targets/filters/templates/foo.j2
diff --git a/test/integration/roles/test_filters/templates/py26json.j2 b/test/integration/targets/filters/templates/py26json.j2
index dba62ad17c..dba62ad17c 100644
--- a/test/integration/roles/test_filters/templates/py26json.j2
+++ b/test/integration/targets/filters/templates/py26json.j2
diff --git a/test/integration/roles/test_filters/vars/main.yml b/test/integration/targets/filters/vars/main.yml
index 7b9f609c95..7b9f609c95 100644
--- a/test/integration/roles/test_filters/vars/main.yml
+++ b/test/integration/targets/filters/vars/main.yml
diff --git a/test/integration/roles/test_gem/meta/main.yml b/test/integration/targets/gem/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_gem/meta/main.yml
+++ b/test/integration/targets/gem/meta/main.yml
diff --git a/test/integration/roles/test_gem/tasks/main.yml b/test/integration/targets/gem/tasks/main.yml
index 476e602634..476e602634 100644
--- a/test/integration/roles/test_gem/tasks/main.yml
+++ b/test/integration/targets/gem/tasks/main.yml
diff --git a/test/integration/roles/test_get_url/meta/main.yml b/test/integration/targets/get_url/meta/main.yml
index b5f2416aed..b5f2416aed 100644
--- a/test/integration/roles/test_get_url/meta/main.yml
+++ b/test/integration/targets/get_url/meta/main.yml
diff --git a/test/integration/roles/test_get_url/tasks/main.yml b/test/integration/targets/get_url/tasks/main.yml
index 521dd9efab..521dd9efab 100644
--- a/test/integration/roles/test_get_url/tasks/main.yml
+++ b/test/integration/targets/get_url/tasks/main.yml
diff --git a/test/integration/roles/test_git/meta/main.yml b/test/integration/targets/git/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_git/meta/main.yml
+++ b/test/integration/targets/git/meta/main.yml
diff --git a/test/integration/roles/test_git/tasks/main.yml b/test/integration/targets/git/tasks/main.yml
index ec842c8407..ec842c8407 100644
--- a/test/integration/roles/test_git/tasks/main.yml
+++ b/test/integration/targets/git/tasks/main.yml
diff --git a/test/integration/roles/test_hg/meta/main.yml b/test/integration/targets/hg/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_hg/meta/main.yml
+++ b/test/integration/targets/hg/meta/main.yml
diff --git a/test/integration/roles/test_hg/tasks/main.yml b/test/integration/targets/hg/tasks/main.yml
index 4eee22e4c7..4eee22e4c7 100644
--- a/test/integration/roles/test_hg/tasks/main.yml
+++ b/test/integration/targets/hg/tasks/main.yml
diff --git a/test/integration/roles/test_ignore_errors/meta/main.yml b/test/integration/targets/ignore_errors/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_ignore_errors/meta/main.yml
+++ b/test/integration/targets/ignore_errors/meta/main.yml
diff --git a/test/integration/roles/test_ignore_errors/tasks/main.yml b/test/integration/targets/ignore_errors/tasks/main.yml
index e0d6ae2f16..e0d6ae2f16 100644
--- a/test/integration/roles/test_ignore_errors/tasks/main.yml
+++ b/test/integration/targets/ignore_errors/tasks/main.yml
diff --git a/test/integration/roles/test_include_vars/defaults/main.yml b/test/integration/targets/include_vars/defaults/main.yml
index 901fb220d2..901fb220d2 100644
--- a/test/integration/roles/test_include_vars/defaults/main.yml
+++ b/test/integration/targets/include_vars/defaults/main.yml
diff --git a/test/integration/roles/test_include_vars/tasks/main.yml b/test/integration/targets/include_vars/tasks/main.yml
index 5ef6b3ef05..5ef6b3ef05 100644
--- a/test/integration/roles/test_include_vars/tasks/main.yml
+++ b/test/integration/targets/include_vars/tasks/main.yml
diff --git a/test/integration/roles/test_include_vars/vars/all/all.yml b/test/integration/targets/include_vars/vars/all/all.yml
index 14c3e92b8e..14c3e92b8e 100644
--- a/test/integration/roles/test_include_vars/vars/all/all.yml
+++ b/test/integration/targets/include_vars/vars/all/all.yml
diff --git a/test/integration/roles/test_include_vars/vars/environments/development/all.yml b/test/integration/targets/include_vars/vars/environments/development/all.yml
index 9f370de549..9f370de549 100644
--- a/test/integration/roles/test_include_vars/vars/environments/development/all.yml
+++ b/test/integration/targets/include_vars/vars/environments/development/all.yml
diff --git a/test/integration/roles/test_include_vars/vars/environments/development/services/webapp.yml b/test/integration/targets/include_vars/vars/environments/development/services/webapp.yml
index a0a809c9e5..a0a809c9e5 100644
--- a/test/integration/roles/test_include_vars/vars/environments/development/services/webapp.yml
+++ b/test/integration/targets/include_vars/vars/environments/development/services/webapp.yml
diff --git a/test/integration/roles/test_include_vars/vars/services/webapp.yml b/test/integration/targets/include_vars/vars/services/webapp.yml
index f0dcc8b517..f0dcc8b517 100644
--- a/test/integration/roles/test_include_vars/vars/services/webapp.yml
+++ b/test/integration/targets/include_vars/vars/services/webapp.yml
diff --git a/test/integration/roles/test_iterators/meta/main.yml b/test/integration/targets/iterators/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_iterators/meta/main.yml
+++ b/test/integration/targets/iterators/meta/main.yml
diff --git a/test/integration/roles/test_iterators/tasks/main.yml b/test/integration/targets/iterators/tasks/main.yml
index 584144af77..584144af77 100644
--- a/test/integration/roles/test_iterators/tasks/main.yml
+++ b/test/integration/targets/iterators/tasks/main.yml
diff --git a/test/integration/roles/test_iterators/vars/main.yml b/test/integration/targets/iterators/vars/main.yml
index f7ef50f57a..f7ef50f57a 100644
--- a/test/integration/roles/test_iterators/vars/main.yml
+++ b/test/integration/targets/iterators/vars/main.yml
diff --git a/test/integration/roles/test_lineinfile/files/test.txt b/test/integration/targets/lineinfile/files/test.txt
index 8187db9f02..8187db9f02 100644
--- a/test/integration/roles/test_lineinfile/files/test.txt
+++ b/test/integration/targets/lineinfile/files/test.txt
diff --git a/test/integration/roles/test_lineinfile/files/testempty.txt b/test/integration/targets/lineinfile/files/testempty.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_lineinfile/files/testempty.txt
+++ b/test/integration/targets/lineinfile/files/testempty.txt
diff --git a/test/integration/roles/test_lineinfile/files/testnoeof.txt b/test/integration/targets/lineinfile/files/testnoeof.txt
index 152780b9ff..152780b9ff 100644
--- a/test/integration/roles/test_lineinfile/files/testnoeof.txt
+++ b/test/integration/targets/lineinfile/files/testnoeof.txt
diff --git a/test/integration/roles/test_lineinfile/meta/main.yml b/test/integration/targets/lineinfile/meta/main.yml
index 98e60f7806..98e60f7806 100644
--- a/test/integration/roles/test_lineinfile/meta/main.yml
+++ b/test/integration/targets/lineinfile/meta/main.yml
diff --git a/test/integration/roles/test_lineinfile/tasks/main.yml b/test/integration/targets/lineinfile/tasks/main.yml
index 8cfb3430f6..8cfb3430f6 100644
--- a/test/integration/roles/test_lineinfile/tasks/main.yml
+++ b/test/integration/targets/lineinfile/tasks/main.yml
diff --git a/test/integration/roles/test_lookups/meta/main.yml b/test/integration/targets/lookups/meta/main.yml
index ee75ae6e65..ee75ae6e65 100644
--- a/test/integration/roles/test_lookups/meta/main.yml
+++ b/test/integration/targets/lookups/meta/main.yml
diff --git a/test/integration/roles/test_lookups/tasks/main.yml b/test/integration/targets/lookups/tasks/main.yml
index f861ceaede..f861ceaede 100644
--- a/test/integration/roles/test_lookups/tasks/main.yml
+++ b/test/integration/targets/lookups/tasks/main.yml
diff --git a/test/integration/roles/test_lookups/vars/main.yml b/test/integration/targets/lookups/vars/main.yml
index 4c44b1cb86..4c44b1cb86 100644
--- a/test/integration/roles/test_lookups/vars/main.yml
+++ b/test/integration/targets/lookups/vars/main.yml
diff --git a/test/integration/roles/test_loops/tasks/main.yml b/test/integration/targets/loops/tasks/main.yml
index 7fa6d0d03a..7fa6d0d03a 100644
--- a/test/integration/roles/test_loops/tasks/main.yml
+++ b/test/integration/targets/loops/tasks/main.yml
diff --git a/test/integration/roles/test_mount/tasks/main.yml b/test/integration/targets/mount/tasks/main.yml
index ab3e0c5f4a..ab3e0c5f4a 100644
--- a/test/integration/roles/test_mount/tasks/main.yml
+++ b/test/integration/targets/mount/tasks/main.yml
diff --git a/test/integration/roles/test_mysql_db/defaults/main.yml b/test/integration/targets/mysql_db/defaults/main.yml
index 456ba0eb4c..456ba0eb4c 100644
--- a/test/integration/roles/test_mysql_db/defaults/main.yml
+++ b/test/integration/targets/mysql_db/defaults/main.yml
diff --git a/test/integration/roles/test_mysql_db/meta/main.yml b/test/integration/targets/mysql_db/meta/main.yml
index 4aa170dc06..4aa170dc06 100644
--- a/test/integration/roles/test_mysql_db/meta/main.yml
+++ b/test/integration/targets/mysql_db/meta/main.yml
diff --git a/test/integration/roles/test_mysql_db/tasks/main.yml b/test/integration/targets/mysql_db/tasks/main.yml
index 1c2adcce8e..1c2adcce8e 100644
--- a/test/integration/roles/test_mysql_db/tasks/main.yml
+++ b/test/integration/targets/mysql_db/tasks/main.yml
diff --git a/test/integration/roles/test_mysql_db/tasks/state_dump_import.yml b/test/integration/targets/mysql_db/tasks/state_dump_import.yml
index 44267e1edb..44267e1edb 100644
--- a/test/integration/roles/test_mysql_db/tasks/state_dump_import.yml
+++ b/test/integration/targets/mysql_db/tasks/state_dump_import.yml
diff --git a/test/integration/roles/test_mysql_user/defaults/main.yml b/test/integration/targets/mysql_user/defaults/main.yml
index ff7503f8f0..ff7503f8f0 100644
--- a/test/integration/roles/test_mysql_user/defaults/main.yml
+++ b/test/integration/targets/mysql_user/defaults/main.yml
diff --git a/test/integration/roles/test_mysql_user/meta/main.yml b/test/integration/targets/mysql_user/meta/main.yml
index 4aa170dc06..4aa170dc06 100644
--- a/test/integration/roles/test_mysql_user/meta/main.yml
+++ b/test/integration/targets/mysql_user/meta/main.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/assert_no_user.yml b/test/integration/targets/mysql_user/tasks/assert_no_user.yml
index 4d4a411fe2..4d4a411fe2 100644
--- a/test/integration/roles/test_mysql_user/tasks/assert_no_user.yml
+++ b/test/integration/targets/mysql_user/tasks/assert_no_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/assert_user.yml b/test/integration/targets/mysql_user/tasks/assert_user.yml
index 7b35a1f350..7b35a1f350 100644
--- a/test/integration/roles/test_mysql_user/tasks/assert_user.yml
+++ b/test/integration/targets/mysql_user/tasks/assert_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/create_user.yml b/test/integration/targets/mysql_user/tasks/create_user.yml
index e7b0d7a33b..e7b0d7a33b 100644
--- a/test/integration/roles/test_mysql_user/tasks/create_user.yml
+++ b/test/integration/targets/mysql_user/tasks/create_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/main.yml b/test/integration/targets/mysql_user/tasks/main.yml
index db6a74dc5c..db6a74dc5c 100644
--- a/test/integration/roles/test_mysql_user/tasks/main.yml
+++ b/test/integration/targets/mysql_user/tasks/main.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/remove_user.yml b/test/integration/targets/mysql_user/tasks/remove_user.yml
index eed959300a..eed959300a 100644
--- a/test/integration/roles/test_mysql_user/tasks/remove_user.yml
+++ b/test/integration/targets/mysql_user/tasks/remove_user.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/test_privs.yml b/test/integration/targets/mysql_user/tasks/test_privs.yml
index 5787501350..5787501350 100644
--- a/test/integration/roles/test_mysql_user/tasks/test_privs.yml
+++ b/test/integration/targets/mysql_user/tasks/test_privs.yml
diff --git a/test/integration/roles/test_mysql_user/tasks/user_password_update_test.yml b/test/integration/targets/mysql_user/tasks/user_password_update_test.yml
index 315066724e..315066724e 100644
--- a/test/integration/roles/test_mysql_user/tasks/user_password_update_test.yml
+++ b/test/integration/targets/mysql_user/tasks/user_password_update_test.yml
diff --git a/test/integration/roles/test_mysql_variables/defaults/main.yml b/test/integration/targets/mysql_variables/defaults/main.yml
index 4683ee0d78..4683ee0d78 100644
--- a/test/integration/roles/test_mysql_variables/defaults/main.yml
+++ b/test/integration/targets/mysql_variables/defaults/main.yml
diff --git a/test/integration/roles/test_mysql_variables/meta/main.yml b/test/integration/targets/mysql_variables/meta/main.yml
index 4aa170dc06..4aa170dc06 100644
--- a/test/integration/roles/test_mysql_variables/meta/main.yml
+++ b/test/integration/targets/mysql_variables/meta/main.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/assert_fail_msg.yml b/test/integration/targets/mysql_variables/tasks/assert_fail_msg.yml
index ba51b9d67c..ba51b9d67c 100644
--- a/test/integration/roles/test_mysql_variables/tasks/assert_fail_msg.yml
+++ b/test/integration/targets/mysql_variables/tasks/assert_fail_msg.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/assert_var.yml b/test/integration/targets/mysql_variables/tasks/assert_var.yml
index db7f3d188a..db7f3d188a 100644
--- a/test/integration/roles/test_mysql_variables/tasks/assert_var.yml
+++ b/test/integration/targets/mysql_variables/tasks/assert_var.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/assert_var_output.yml b/test/integration/targets/mysql_variables/tasks/assert_var_output.yml
index 6a321a6f83..6a321a6f83 100644
--- a/test/integration/roles/test_mysql_variables/tasks/assert_var_output.yml
+++ b/test/integration/targets/mysql_variables/tasks/assert_var_output.yml
diff --git a/test/integration/roles/test_mysql_variables/tasks/main.yml b/test/integration/targets/mysql_variables/tasks/main.yml
index 26fc03c867..26fc03c867 100644
--- a/test/integration/roles/test_mysql_variables/tasks/main.yml
+++ b/test/integration/targets/mysql_variables/tasks/main.yml
diff --git a/test/integration/roles/test_ping/tasks/main.yml b/test/integration/targets/ping/tasks/main.yml
index d7cbe64aff..d7cbe64aff 100644
--- a/test/integration/roles/test_ping/tasks/main.yml
+++ b/test/integration/targets/ping/tasks/main.yml
diff --git a/test/integration/roles/test_pip/meta/main.yml b/test/integration/targets/pip/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_pip/meta/main.yml
+++ b/test/integration/targets/pip/meta/main.yml
diff --git a/test/integration/roles/test_pip/tasks/main.yml b/test/integration/targets/pip/tasks/main.yml
index fec7c2af51..fec7c2af51 100644
--- a/test/integration/roles/test_pip/tasks/main.yml
+++ b/test/integration/targets/pip/tasks/main.yml
diff --git a/test/integration/roles/test_pip/tasks/pip.yml b/test/integration/targets/pip/tasks/pip.yml
index dc9bfb781e..dc9bfb781e 100644
--- a/test/integration/roles/test_pip/tasks/pip.yml
+++ b/test/integration/targets/pip/tasks/pip.yml
diff --git a/test/integration/roles/test_postgresql/defaults/main.yml b/test/integration/targets/postgresql/defaults/main.yml
index cfc50737c6..cfc50737c6 100644
--- a/test/integration/roles/test_postgresql/defaults/main.yml
+++ b/test/integration/targets/postgresql/defaults/main.yml
diff --git a/test/integration/roles/test_postgresql/meta/main.yml b/test/integration/targets/postgresql/meta/main.yml
index 85b1dc7e4c..85b1dc7e4c 100644
--- a/test/integration/roles/test_postgresql/meta/main.yml
+++ b/test/integration/targets/postgresql/meta/main.yml
diff --git a/test/integration/roles/test_postgresql/tasks/main.yml b/test/integration/targets/postgresql/tasks/main.yml
index 8949fe1efa..8949fe1efa 100644
--- a/test/integration/roles/test_postgresql/tasks/main.yml
+++ b/test/integration/targets/postgresql/tasks/main.yml
diff --git a/test/integration/roles/prepare_http_tests/defaults/main.yml b/test/integration/targets/prepare_http_tests/defaults/main.yml
index 1114729623..1114729623 100644
--- a/test/integration/roles/prepare_http_tests/defaults/main.yml
+++ b/test/integration/targets/prepare_http_tests/defaults/main.yml
diff --git a/test/integration/roles/prepare_http_tests/tasks/main.yml b/test/integration/targets/prepare_http_tests/tasks/main.yml
index 3e56320529..3e56320529 100644
--- a/test/integration/roles/prepare_http_tests/tasks/main.yml
+++ b/test/integration/targets/prepare_http_tests/tasks/main.yml
diff --git a/test/integration/roles/prepare_http_tests/vars/httptester.yml b/test/integration/targets/prepare_http_tests/vars/httptester.yml
index 0e23ae936a..0e23ae936a 100644
--- a/test/integration/roles/prepare_http_tests/vars/httptester.yml
+++ b/test/integration/targets/prepare_http_tests/vars/httptester.yml
diff --git a/test/integration/roles/test_service/templates/main.yml b/test/integration/targets/prepare_tests/tasks/main.yml
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_service/templates/main.yml
+++ b/test/integration/targets/prepare_tests/tasks/main.yml
diff --git a/test/integration/roles/test_script/files/create_afile.sh b/test/integration/targets/script/files/create_afile.sh
index e6fae448b2..e6fae448b2 100755
--- a/test/integration/roles/test_script/files/create_afile.sh
+++ b/test/integration/targets/script/files/create_afile.sh
diff --git a/test/integration/roles/test_script/files/remove_afile.sh b/test/integration/targets/script/files/remove_afile.sh
index 4a7fea6617..4a7fea6617 100755
--- a/test/integration/roles/test_script/files/remove_afile.sh
+++ b/test/integration/targets/script/files/remove_afile.sh
diff --git a/test/integration/roles/test_script/files/test.sh b/test/integration/targets/script/files/test.sh
index ade17e9b8c..ade17e9b8c 100755
--- a/test/integration/roles/test_script/files/test.sh
+++ b/test/integration/targets/script/files/test.sh
diff --git a/test/integration/roles/test_script/meta/main.yml b/test/integration/targets/script/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_script/meta/main.yml
+++ b/test/integration/targets/script/meta/main.yml
diff --git a/test/integration/roles/test_script/tasks/main.yml b/test/integration/targets/script/tasks/main.yml
index 2c0f1f02ad..2c0f1f02ad 100644
--- a/test/integration/roles/test_script/tasks/main.yml
+++ b/test/integration/targets/script/tasks/main.yml
diff --git a/test/integration/roles/test_service/files/ansible-broken.upstart b/test/integration/targets/service/files/ansible-broken.upstart
index 4e9c6694a1..4e9c6694a1 100644
--- a/test/integration/roles/test_service/files/ansible-broken.upstart
+++ b/test/integration/targets/service/files/ansible-broken.upstart
diff --git a/test/integration/roles/test_service/files/ansible.systemd b/test/integration/targets/service/files/ansible.systemd
index c1a710a1b3..c1a710a1b3 100644
--- a/test/integration/roles/test_service/files/ansible.systemd
+++ b/test/integration/targets/service/files/ansible.systemd
diff --git a/test/integration/roles/test_service/files/ansible.sysv b/test/integration/targets/service/files/ansible.sysv
index 372ea6e5b9..372ea6e5b9 100755
--- a/test/integration/roles/test_service/files/ansible.sysv
+++ b/test/integration/targets/service/files/ansible.sysv
diff --git a/test/integration/roles/test_service/files/ansible.upstart b/test/integration/targets/service/files/ansible.upstart
index 369f61a83c..369f61a83c 100644
--- a/test/integration/roles/test_service/files/ansible.upstart
+++ b/test/integration/targets/service/files/ansible.upstart
diff --git a/test/integration/roles/test_service/files/ansible_test_service b/test/integration/targets/service/files/ansible_test_service
index 5e8691f2f1..5e8691f2f1 100755
--- a/test/integration/roles/test_service/files/ansible_test_service
+++ b/test/integration/targets/service/files/ansible_test_service
diff --git a/test/integration/roles/test_service/meta/main.yml b/test/integration/targets/service/meta/main.yml
index 399f3fb6e7..399f3fb6e7 100644
--- a/test/integration/roles/test_service/meta/main.yml
+++ b/test/integration/targets/service/meta/main.yml
diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/targets/service/tasks/main.yml
index e11702c4df..e11702c4df 100644
--- a/test/integration/roles/test_service/tasks/main.yml
+++ b/test/integration/targets/service/tasks/main.yml
diff --git a/test/integration/roles/test_service/tasks/systemd_cleanup.yml b/test/integration/targets/service/tasks/systemd_cleanup.yml
index 10a60b216c..10a60b216c 100644
--- a/test/integration/roles/test_service/tasks/systemd_cleanup.yml
+++ b/test/integration/targets/service/tasks/systemd_cleanup.yml
diff --git a/test/integration/roles/test_service/tasks/systemd_setup.yml b/test/integration/targets/service/tasks/systemd_setup.yml
index bee5ce1f28..bee5ce1f28 100644
--- a/test/integration/roles/test_service/tasks/systemd_setup.yml
+++ b/test/integration/targets/service/tasks/systemd_setup.yml
diff --git a/test/integration/roles/test_service/tasks/sysv_cleanup.yml b/test/integration/targets/service/tasks/sysv_cleanup.yml
index b42744391b..b42744391b 100644
--- a/test/integration/roles/test_service/tasks/sysv_cleanup.yml
+++ b/test/integration/targets/service/tasks/sysv_cleanup.yml
diff --git a/test/integration/roles/test_service/tasks/sysv_setup.yml b/test/integration/targets/service/tasks/sysv_setup.yml
index 796a2fe9a7..796a2fe9a7 100644
--- a/test/integration/roles/test_service/tasks/sysv_setup.yml
+++ b/test/integration/targets/service/tasks/sysv_setup.yml
diff --git a/test/integration/roles/test_service/tasks/upstart_cleanup.yml b/test/integration/targets/service/tasks/upstart_cleanup.yml
index a589d5a986..a589d5a986 100644
--- a/test/integration/roles/test_service/tasks/upstart_cleanup.yml
+++ b/test/integration/targets/service/tasks/upstart_cleanup.yml
diff --git a/test/integration/roles/test_service/tasks/upstart_setup.yml b/test/integration/targets/service/tasks/upstart_setup.yml
index e9607bb030..e9607bb030 100644
--- a/test/integration/roles/test_service/tasks/upstart_setup.yml
+++ b/test/integration/targets/service/tasks/upstart_setup.yml
diff --git a/test/integration/roles/test_special_vars/vars/main.yml b/test/integration/targets/service/templates/main.yml
index e69de29bb2..e69de29bb2 100644
--- a/test/integration/roles/test_special_vars/vars/main.yml
+++ b/test/integration/targets/service/templates/main.yml
diff --git a/test/integration/roles/setup_mysql_db/defaults/main.yml b/test/integration/targets/setup_mysql_db/defaults/main.yml
index 744d0118d1..744d0118d1 100644
--- a/test/integration/roles/setup_mysql_db/defaults/main.yml
+++ b/test/integration/targets/setup_mysql_db/defaults/main.yml
diff --git a/test/integration/roles/setup_mysql_db/tasks/main.yml b/test/integration/targets/setup_mysql_db/tasks/main.yml
index d30f6967cb..d30f6967cb 100644
--- a/test/integration/roles/setup_mysql_db/tasks/main.yml
+++ b/test/integration/targets/setup_mysql_db/tasks/main.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/Debian.yml b/test/integration/targets/setup_mysql_db/vars/Debian.yml
index 21dfaad23a..21dfaad23a 100644
--- a/test/integration/roles/setup_mysql_db/vars/Debian.yml
+++ b/test/integration/targets/setup_mysql_db/vars/Debian.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/Fedora.yml b/test/integration/targets/setup_mysql_db/vars/Fedora.yml
index f8b29fd7a1..f8b29fd7a1 100644
--- a/test/integration/roles/setup_mysql_db/vars/Fedora.yml
+++ b/test/integration/targets/setup_mysql_db/vars/Fedora.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/RedHat-7.yml b/test/integration/targets/setup_mysql_db/vars/RedHat-7.yml
index f8b29fd7a1..f8b29fd7a1 100644
--- a/test/integration/roles/setup_mysql_db/vars/RedHat-7.yml
+++ b/test/integration/targets/setup_mysql_db/vars/RedHat-7.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/RedHat.yml b/test/integration/targets/setup_mysql_db/vars/RedHat.yml
index 0c2e2b7d7c..0c2e2b7d7c 100644
--- a/test/integration/roles/setup_mysql_db/vars/RedHat.yml
+++ b/test/integration/targets/setup_mysql_db/vars/RedHat.yml
diff --git a/test/integration/roles/setup_mysql_db/vars/Suse.yml b/test/integration/targets/setup_mysql_db/vars/Suse.yml
index feeeccd053..feeeccd053 100644
--- a/test/integration/roles/setup_mysql_db/vars/Suse.yml
+++ b/test/integration/targets/setup_mysql_db/vars/Suse.yml
diff --git a/test/integration/roles/setup_postgresql_db/defaults/main.yml b/test/integration/targets/setup_postgresql_db/defaults/main.yml
index 08f3a91b46..08f3a91b46 100644
--- a/test/integration/roles/setup_postgresql_db/defaults/main.yml
+++ b/test/integration/targets/setup_postgresql_db/defaults/main.yml
diff --git a/test/integration/roles/setup_postgresql_db/files/pg_hba.conf b/test/integration/targets/setup_postgresql_db/files/pg_hba.conf
index a8defb8ee6..a8defb8ee6 100644
--- a/test/integration/roles/setup_postgresql_db/files/pg_hba.conf
+++ b/test/integration/targets/setup_postgresql_db/files/pg_hba.conf
diff --git a/test/integration/roles/setup_postgresql_db/tasks/main.yml b/test/integration/targets/setup_postgresql_db/tasks/main.yml
index 351e5c8958..351e5c8958 100644
--- a/test/integration/roles/setup_postgresql_db/tasks/main.yml
+++ b/test/integration/targets/setup_postgresql_db/tasks/main.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Debian-8.yml b/test/integration/targets/setup_postgresql_db/vars/Debian-8.yml
index f829bd1996..f829bd1996 100644
--- a/test/integration/roles/setup_postgresql_db/vars/Debian-8.yml
+++ b/test/integration/targets/setup_postgresql_db/vars/Debian-8.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-12.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
index b2507c9849..b2507c9849 100644
--- a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-12.yml
+++ b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-14.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-14.yml
index 7d704264da..7d704264da 100644
--- a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-14.yml
+++ b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-14.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-16.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-16.yml
index 7b6092a12c..7b6092a12c 100644
--- a/test/integration/roles/setup_postgresql_db/vars/Ubuntu-16.yml
+++ b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-16.yml
diff --git a/test/integration/roles/setup_postgresql_db/vars/default.yml b/test/integration/targets/setup_postgresql_db/vars/default.yml
index dc7db0fc98..dc7db0fc98 100644
--- a/test/integration/roles/setup_postgresql_db/vars/default.yml
+++ b/test/integration/targets/setup_postgresql_db/vars/default.yml
diff --git a/test/integration/roles/test_special_vars/meta/main.yml b/test/integration/targets/special_vars/meta/main.yml
index a8b63dfdf2..a8b63dfdf2 100644
--- a/test/integration/roles/test_special_vars/meta/main.yml
+++ b/test/integration/targets/special_vars/meta/main.yml
diff --git a/test/integration/roles/test_special_vars/tasks/main.yml b/test/integration/targets/special_vars/tasks/main.yml
index 653bf7b905..653bf7b905 100644
--- a/test/integration/roles/test_special_vars/tasks/main.yml
+++ b/test/integration/targets/special_vars/tasks/main.yml
diff --git a/test/integration/roles/test_special_vars/templates/foo.j2 b/test/integration/targets/special_vars/templates/foo.j2
index 0f6db2a166..0f6db2a166 100644
--- a/test/integration/roles/test_special_vars/templates/foo.j2
+++ b/test/integration/targets/special_vars/templates/foo.j2
diff --git a/test/integration/targets/special_vars/vars/main.yml b/test/integration/targets/special_vars/vars/main.yml
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/integration/targets/special_vars/vars/main.yml
diff --git a/test/integration/roles/test_stat/files/foo.txt b/test/integration/targets/stat/files/foo.txt
index 3e96db9b3e..3e96db9b3e 100644
--- a/test/integration/roles/test_stat/files/foo.txt
+++ b/test/integration/targets/stat/files/foo.txt
diff --git a/test/integration/roles/test_stat/meta/main.yml b/test/integration/targets/stat/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_stat/meta/main.yml
+++ b/test/integration/targets/stat/meta/main.yml
diff --git a/test/integration/roles/test_stat/tasks/main.yml b/test/integration/targets/stat/tasks/main.yml
index 72bc1cac15..72bc1cac15 100644
--- a/test/integration/roles/test_stat/tasks/main.yml
+++ b/test/integration/targets/stat/tasks/main.yml
diff --git a/test/integration/roles/test_subversion/meta/main.yml b/test/integration/targets/subversion/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_subversion/meta/main.yml
+++ b/test/integration/targets/subversion/meta/main.yml
diff --git a/test/integration/roles/test_subversion/tasks/main.yml b/test/integration/targets/subversion/tasks/main.yml
index d15d63ab02..d15d63ab02 100644
--- a/test/integration/roles/test_subversion/tasks/main.yml
+++ b/test/integration/targets/subversion/tasks/main.yml
diff --git a/test/integration/roles/test_synchronize/files/bar.txt b/test/integration/targets/synchronize/files/bar.txt
index 3e96db9b3e..3e96db9b3e 100644
--- a/test/integration/roles/test_synchronize/files/bar.txt
+++ b/test/integration/targets/synchronize/files/bar.txt
diff --git a/test/integration/roles/test_synchronize/files/foo.txt b/test/integration/targets/synchronize/files/foo.txt
index 3e96db9b3e..3e96db9b3e 100644
--- a/test/integration/roles/test_synchronize/files/foo.txt
+++ b/test/integration/targets/synchronize/files/foo.txt
diff --git a/test/integration/roles/test_synchronize/meta/main.yml b/test/integration/targets/synchronize/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_synchronize/meta/main.yml
+++ b/test/integration/targets/synchronize/meta/main.yml
diff --git a/test/integration/roles/test_synchronize/tasks/main.yml b/test/integration/targets/synchronize/tasks/main.yml
index 483367047d..483367047d 100644
--- a/test/integration/roles/test_synchronize/tasks/main.yml
+++ b/test/integration/targets/synchronize/tasks/main.yml
diff --git a/test/integration/roles/test_task_ordering/tasks/main.yml b/test/integration/targets/task_ordering/tasks/main.yml
index edd1890a90..edd1890a90 100644
--- a/test/integration/roles/test_task_ordering/tasks/main.yml
+++ b/test/integration/targets/task_ordering/tasks/main.yml
diff --git a/test/integration/roles/test_task_ordering/tasks/taskorder-include.yml b/test/integration/targets/task_ordering/tasks/taskorder-include.yml
index 4e64b7e927..4e64b7e927 100644
--- a/test/integration/roles/test_task_ordering/tasks/taskorder-include.yml
+++ b/test/integration/targets/task_ordering/tasks/taskorder-include.yml
diff --git a/test/integration/roles/test_template/files/foo-py26.txt b/test/integration/targets/template/files/foo-py26.txt
index 76b0bb56f7..76b0bb56f7 100644
--- a/test/integration/roles/test_template/files/foo-py26.txt
+++ b/test/integration/targets/template/files/foo-py26.txt
diff --git a/test/integration/roles/test_template/files/foo.txt b/test/integration/targets/template/files/foo.txt
index 58af3be81b..58af3be81b 100644
--- a/test/integration/roles/test_template/files/foo.txt
+++ b/test/integration/targets/template/files/foo.txt
diff --git a/test/integration/roles/test_template/meta/main.yml b/test/integration/targets/template/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_template/meta/main.yml
+++ b/test/integration/targets/template/meta/main.yml
diff --git a/test/integration/roles/test_template/tasks/main.yml b/test/integration/targets/template/tasks/main.yml
index 133690ff05..133690ff05 100644
--- a/test/integration/roles/test_template/tasks/main.yml
+++ b/test/integration/targets/template/tasks/main.yml
diff --git a/test/integration/roles/test_template/templates/foo.j2 b/test/integration/targets/template/templates/foo.j2
index 22187f9130..22187f9130 100644
--- a/test/integration/roles/test_template/templates/foo.j2
+++ b/test/integration/targets/template/templates/foo.j2
diff --git a/test/integration/roles/test_template/templates/short.j2 b/test/integration/targets/template/templates/short.j2
index 55aab8f1ea..55aab8f1ea 100644
--- a/test/integration/roles/test_template/templates/short.j2
+++ b/test/integration/targets/template/templates/short.j2
diff --git a/test/integration/roles/test_template/vars/main.yml b/test/integration/targets/template/vars/main.yml
index 16776cb7e8..16776cb7e8 100644
--- a/test/integration/roles/test_template/vars/main.yml
+++ b/test/integration/targets/template/vars/main.yml
diff --git a/test/integration/roles/test_unarchive/files/foo.txt b/test/integration/targets/unarchive/files/foo.txt
index 7c6ded14ec..7c6ded14ec 100644
--- a/test/integration/roles/test_unarchive/files/foo.txt
+++ b/test/integration/targets/unarchive/files/foo.txt
diff --git a/test/integration/roles/test_unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz b/test/integration/targets/unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz
index 4882b9207a..4882b9207a 100644
--- a/test/integration/roles/test_unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz
+++ b/test/integration/targets/unarchive/files/test-unarchive-nonascii-くらとみ.tar.gz
diff --git a/test/integration/roles/test_unarchive/meta/main.yml b/test/integration/targets/unarchive/meta/main.yml
index 1050c23ce3..1050c23ce3 100644
--- a/test/integration/roles/test_unarchive/meta/main.yml
+++ b/test/integration/targets/unarchive/meta/main.yml
diff --git a/test/integration/roles/test_unarchive/tasks/main.yml b/test/integration/targets/unarchive/tasks/main.yml
index e17e5b2ccb..e17e5b2ccb 100644
--- a/test/integration/roles/test_unarchive/tasks/main.yml
+++ b/test/integration/targets/unarchive/tasks/main.yml
diff --git a/test/integration/roles/test_until/tasks/main.yml b/test/integration/targets/until/tasks/main.yml
index 74a214756d..74a214756d 100644
--- a/test/integration/roles/test_until/tasks/main.yml
+++ b/test/integration/targets/until/tasks/main.yml
diff --git a/test/integration/roles/test_uri/files/README b/test/integration/targets/uri/files/README
index ef7791262b..ef7791262b 100644
--- a/test/integration/roles/test_uri/files/README
+++ b/test/integration/targets/uri/files/README
diff --git a/test/integration/roles/test_uri/files/fail0.json b/test/integration/targets/uri/files/fail0.json
index ca5eb19dc9..ca5eb19dc9 100644
--- a/test/integration/roles/test_uri/files/fail0.json
+++ b/test/integration/targets/uri/files/fail0.json
diff --git a/test/integration/roles/test_uri/files/fail1.json b/test/integration/targets/uri/files/fail1.json
index 6b7c11e5a5..6b7c11e5a5 100644
--- a/test/integration/roles/test_uri/files/fail1.json
+++ b/test/integration/targets/uri/files/fail1.json
diff --git a/test/integration/roles/test_uri/files/fail10.json b/test/integration/targets/uri/files/fail10.json
index 76eb95b458..76eb95b458 100644
--- a/test/integration/roles/test_uri/files/fail10.json
+++ b/test/integration/targets/uri/files/fail10.json
diff --git a/test/integration/roles/test_uri/files/fail11.json b/test/integration/targets/uri/files/fail11.json
index 77580a4522..77580a4522 100644
--- a/test/integration/roles/test_uri/files/fail11.json
+++ b/test/integration/targets/uri/files/fail11.json
diff --git a/test/integration/roles/test_uri/files/fail12.json b/test/integration/targets/uri/files/fail12.json
index 379406b59b..379406b59b 100644
--- a/test/integration/roles/test_uri/files/fail12.json
+++ b/test/integration/targets/uri/files/fail12.json
diff --git a/test/integration/roles/test_uri/files/fail13.json b/test/integration/targets/uri/files/fail13.json
index 0ed366b38a..0ed366b38a 100644
--- a/test/integration/roles/test_uri/files/fail13.json
+++ b/test/integration/targets/uri/files/fail13.json
diff --git a/test/integration/roles/test_uri/files/fail14.json b/test/integration/targets/uri/files/fail14.json
index fc8376b605..fc8376b605 100644
--- a/test/integration/roles/test_uri/files/fail14.json
+++ b/test/integration/targets/uri/files/fail14.json
diff --git a/test/integration/roles/test_uri/files/fail15.json b/test/integration/targets/uri/files/fail15.json
index 3fe21d4b53..3fe21d4b53 100644
--- a/test/integration/roles/test_uri/files/fail15.json
+++ b/test/integration/targets/uri/files/fail15.json
diff --git a/test/integration/roles/test_uri/files/fail16.json b/test/integration/targets/uri/files/fail16.json
index 62b9214aed..62b9214aed 100644
--- a/test/integration/roles/test_uri/files/fail16.json
+++ b/test/integration/targets/uri/files/fail16.json
diff --git a/test/integration/roles/test_uri/files/fail17.json b/test/integration/targets/uri/files/fail17.json
index 45cba7396f..45cba7396f 100644
--- a/test/integration/roles/test_uri/files/fail17.json
+++ b/test/integration/targets/uri/files/fail17.json
diff --git a/test/integration/roles/test_uri/files/fail18.json b/test/integration/targets/uri/files/fail18.json
index 3b9c46fa9a..3b9c46fa9a 100644
--- a/test/integration/roles/test_uri/files/fail18.json
+++ b/test/integration/targets/uri/files/fail18.json
diff --git a/test/integration/roles/test_uri/files/fail19.json b/test/integration/targets/uri/files/fail19.json
index 27c1af3e72..27c1af3e72 100644
--- a/test/integration/roles/test_uri/files/fail19.json
+++ b/test/integration/targets/uri/files/fail19.json
diff --git a/test/integration/roles/test_uri/files/fail2.json b/test/integration/targets/uri/files/fail2.json
index 168c81eb78..168c81eb78 100644
--- a/test/integration/roles/test_uri/files/fail2.json
+++ b/test/integration/targets/uri/files/fail2.json
diff --git a/test/integration/roles/test_uri/files/fail20.json b/test/integration/targets/uri/files/fail20.json
index 62474573b2..62474573b2 100644
--- a/test/integration/roles/test_uri/files/fail20.json
+++ b/test/integration/targets/uri/files/fail20.json
diff --git a/test/integration/roles/test_uri/files/fail21.json b/test/integration/targets/uri/files/fail21.json
index a7752581bc..a7752581bc 100644
--- a/test/integration/roles/test_uri/files/fail21.json
+++ b/test/integration/targets/uri/files/fail21.json
diff --git a/test/integration/roles/test_uri/files/fail22.json b/test/integration/targets/uri/files/fail22.json
index 494add1ca1..494add1ca1 100644
--- a/test/integration/roles/test_uri/files/fail22.json
+++ b/test/integration/targets/uri/files/fail22.json
diff --git a/test/integration/roles/test_uri/files/fail23.json b/test/integration/targets/uri/files/fail23.json
index caff239bfc..caff239bfc 100644
--- a/test/integration/roles/test_uri/files/fail23.json
+++ b/test/integration/targets/uri/files/fail23.json
diff --git a/test/integration/roles/test_uri/files/fail24.json b/test/integration/targets/uri/files/fail24.json
index 8b7ad23e01..8b7ad23e01 100644
--- a/test/integration/roles/test_uri/files/fail24.json
+++ b/test/integration/targets/uri/files/fail24.json
diff --git a/test/integration/roles/test_uri/files/fail25.json b/test/integration/targets/uri/files/fail25.json
index 845d26a6a5..845d26a6a5 100644
--- a/test/integration/roles/test_uri/files/fail25.json
+++ b/test/integration/targets/uri/files/fail25.json
diff --git a/test/integration/roles/test_uri/files/fail26.json b/test/integration/targets/uri/files/fail26.json
index 6b01a2ca4a..6b01a2ca4a 100644
--- a/test/integration/roles/test_uri/files/fail26.json
+++ b/test/integration/targets/uri/files/fail26.json
diff --git a/test/integration/roles/test_uri/files/fail27.json b/test/integration/targets/uri/files/fail27.json
index 621a0101c6..621a0101c6 100644
--- a/test/integration/roles/test_uri/files/fail27.json
+++ b/test/integration/targets/uri/files/fail27.json
diff --git a/test/integration/roles/test_uri/files/fail28.json b/test/integration/targets/uri/files/fail28.json
index 47ec421bb6..47ec421bb6 100644
--- a/test/integration/roles/test_uri/files/fail28.json
+++ b/test/integration/targets/uri/files/fail28.json
diff --git a/test/integration/roles/test_uri/files/fail29.json b/test/integration/targets/uri/files/fail29.json
index 8ab0bc4b8b..8ab0bc4b8b 100644
--- a/test/integration/roles/test_uri/files/fail29.json
+++ b/test/integration/targets/uri/files/fail29.json
diff --git a/test/integration/roles/test_uri/files/fail3.json b/test/integration/targets/uri/files/fail3.json
index 9de168bf34..9de168bf34 100644
--- a/test/integration/roles/test_uri/files/fail3.json
+++ b/test/integration/targets/uri/files/fail3.json
diff --git a/test/integration/roles/test_uri/files/fail30.json b/test/integration/targets/uri/files/fail30.json
index 1cce602b51..1cce602b51 100644
--- a/test/integration/roles/test_uri/files/fail30.json
+++ b/test/integration/targets/uri/files/fail30.json
diff --git a/test/integration/roles/test_uri/files/fail4.json b/test/integration/targets/uri/files/fail4.json
index ddf3ce3d24..ddf3ce3d24 100644
--- a/test/integration/roles/test_uri/files/fail4.json
+++ b/test/integration/targets/uri/files/fail4.json
diff --git a/test/integration/roles/test_uri/files/fail5.json b/test/integration/targets/uri/files/fail5.json
index ed91580e1b..ed91580e1b 100644
--- a/test/integration/roles/test_uri/files/fail5.json
+++ b/test/integration/targets/uri/files/fail5.json
diff --git a/test/integration/roles/test_uri/files/fail6.json b/test/integration/targets/uri/files/fail6.json
index 8a96af3e4e..8a96af3e4e 100644
--- a/test/integration/roles/test_uri/files/fail6.json
+++ b/test/integration/targets/uri/files/fail6.json
diff --git a/test/integration/roles/test_uri/files/fail7.json b/test/integration/targets/uri/files/fail7.json
index b28479c6ec..b28479c6ec 100644
--- a/test/integration/roles/test_uri/files/fail7.json
+++ b/test/integration/targets/uri/files/fail7.json
diff --git a/test/integration/roles/test_uri/files/fail8.json b/test/integration/targets/uri/files/fail8.json
index 5815574f36..5815574f36 100644
--- a/test/integration/roles/test_uri/files/fail8.json
+++ b/test/integration/targets/uri/files/fail8.json
diff --git a/test/integration/roles/test_uri/files/fail9.json b/test/integration/targets/uri/files/fail9.json
index 5d8c0047bd..5d8c0047bd 100644
--- a/test/integration/roles/test_uri/files/fail9.json
+++ b/test/integration/targets/uri/files/fail9.json
diff --git a/test/integration/roles/test_uri/files/pass0.json b/test/integration/targets/uri/files/pass0.json
index 70e2685436..70e2685436 100644
--- a/test/integration/roles/test_uri/files/pass0.json
+++ b/test/integration/targets/uri/files/pass0.json
diff --git a/test/integration/roles/test_uri/files/pass1.json b/test/integration/targets/uri/files/pass1.json
index d3c63c7ad8..d3c63c7ad8 100644
--- a/test/integration/roles/test_uri/files/pass1.json
+++ b/test/integration/targets/uri/files/pass1.json
diff --git a/test/integration/roles/test_uri/files/pass2.json b/test/integration/targets/uri/files/pass2.json
index 4528d51f1a..4528d51f1a 100644
--- a/test/integration/roles/test_uri/files/pass2.json
+++ b/test/integration/targets/uri/files/pass2.json
diff --git a/test/integration/roles/test_uri/files/pass3.json b/test/integration/targets/uri/files/pass3.json
index 6216b865f1..6216b865f1 100644
--- a/test/integration/roles/test_uri/files/pass3.json
+++ b/test/integration/targets/uri/files/pass3.json
diff --git a/test/integration/roles/test_uri/files/pass4.json b/test/integration/targets/uri/files/pass4.json
index edac92716f..edac92716f 100644
--- a/test/integration/roles/test_uri/files/pass4.json
+++ b/test/integration/targets/uri/files/pass4.json
diff --git a/test/integration/roles/test_uri/files/testserver.py b/test/integration/targets/uri/files/testserver.py
index d0d24a0050..d0d24a0050 100644
--- a/test/integration/roles/test_uri/files/testserver.py
+++ b/test/integration/targets/uri/files/testserver.py
diff --git a/test/integration/roles/test_uri/meta/main.yml b/test/integration/targets/uri/meta/main.yml
index a5f3f70736..a5f3f70736 100644
--- a/test/integration/roles/test_uri/meta/main.yml
+++ b/test/integration/targets/uri/meta/main.yml
diff --git a/test/integration/roles/test_uri/tasks/main.yml b/test/integration/targets/uri/tasks/main.yml
index bfb193a26b..bfb193a26b 100644
--- a/test/integration/roles/test_uri/tasks/main.yml
+++ b/test/integration/targets/uri/tasks/main.yml
diff --git a/test/integration/roles/test_uri/vars/main.yml b/test/integration/targets/uri/vars/main.yml
index b819276f65..b819276f65 100644
--- a/test/integration/roles/test_uri/vars/main.yml
+++ b/test/integration/targets/uri/vars/main.yml
diff --git a/test/integration/roles/test_yum/meta/main.yml b/test/integration/targets/yum/meta/main.yml
index 07faa21776..07faa21776 100644
--- a/test/integration/roles/test_yum/meta/main.yml
+++ b/test/integration/targets/yum/meta/main.yml
diff --git a/test/integration/roles/test_yum/tasks/main.yml b/test/integration/targets/yum/tasks/main.yml
index 41ce38f7c8..41ce38f7c8 100644
--- a/test/integration/roles/test_yum/tasks/main.yml
+++ b/test/integration/targets/yum/tasks/main.yml
diff --git a/test/integration/roles/test_yum/tasks/yum.yml b/test/integration/targets/yum/tasks/yum.yml
index f285326f5f..f285326f5f 100644
--- a/test/integration/roles/test_yum/tasks/yum.yml
+++ b/test/integration/targets/yum/tasks/yum.yml
diff --git a/test/integration/roles/test_zypper/files/empty.spec b/test/integration/targets/zypper/files/empty.spec
index 044ea3a548..044ea3a548 100644
--- a/test/integration/roles/test_zypper/files/empty.spec
+++ b/test/integration/targets/zypper/files/empty.spec
diff --git a/test/integration/roles/test_zypper/meta/main.yml b/test/integration/targets/zypper/meta/main.yml
index 07faa21776..07faa21776 100644
--- a/test/integration/roles/test_zypper/meta/main.yml
+++ b/test/integration/targets/zypper/meta/main.yml
diff --git a/test/integration/roles/test_zypper/tasks/main.yml b/test/integration/targets/zypper/tasks/main.yml
index f2ad3cdce0..f2ad3cdce0 100644
--- a/test/integration/roles/test_zypper/tasks/main.yml
+++ b/test/integration/targets/zypper/tasks/main.yml
diff --git a/test/integration/roles/test_zypper/tasks/zypper.yml b/test/integration/targets/zypper/tasks/zypper.yml
index 4fe05f0125..4fe05f0125 100644
--- a/test/integration/roles/test_zypper/tasks/zypper.yml
+++ b/test/integration/targets/zypper/tasks/zypper.yml
diff --git a/test/integration/roles/test_zypper_repository/meta/main.yml b/test/integration/targets/zypper_repository/meta/main.yml
index 07faa21776..07faa21776 100644
--- a/test/integration/roles/test_zypper_repository/meta/main.yml
+++ b/test/integration/targets/zypper_repository/meta/main.yml
diff --git a/test/integration/roles/test_zypper_repository/tasks/main.yml b/test/integration/targets/zypper_repository/tasks/main.yml
index b2c4f754b9..b2c4f754b9 100644
--- a/test/integration/roles/test_zypper_repository/tasks/main.yml
+++ b/test/integration/targets/zypper_repository/tasks/main.yml
diff --git a/test/integration/roles/test_zypper_repository/tasks/zypper_repository.yml b/test/integration/targets/zypper_repository/tasks/zypper_repository.yml
index 027a11ce55..027a11ce55 100644
--- a/test/integration/roles/test_zypper_repository/tasks/zypper_repository.yml
+++ b/test/integration/targets/zypper_repository/tasks/zypper_repository.yml