diff --git a/tests/ansible/setup/all.yml b/tests/ansible/setup/all.yml
index 2ca6b97c..8903494d 100644
--- a/tests/ansible/setup/all.yml
+++ b/tests/ansible/setup/all.yml
@@ -1 +1,2 @@
-- import_playbook: report.yml
+- import_playbook: report_controller.yml
+- import_playbook: report_targets.yml
diff --git a/tests/ansible/setup/report_controller.yml b/tests/ansible/setup/report_controller.yml
new file mode 100644
index 00000000..d0d5cc15
--- /dev/null
+++ b/tests/ansible/setup/report_controller.yml
@@ -0,0 +1,17 @@
+- name: Report controller parameters
+  hosts: localhost
+  gather_facts: false
+  tasks:
+    - debug:
+        msg:
+          - ${ANSIBLE_STRATEGY}:      "{{ lookup('env', 'ANSIBLE_STRATEGY') | default('<unset>') }}"
+          - ${USER}:                  "{{ lookup('env', 'USER') | default('<unset>') }}"
+          - $(groups):                "{{ lookup('pipe', 'groups') }}"
+          - $(pwd):                   "{{ lookup('pipe', 'pwd') }}"
+          - $(whoami):                "{{ lookup('pipe', 'whoami') }}"
+          - ansible_run_tags:         "{{ ansible_run_tags | default('<unset>') }}"
+          - ansible_playbook_python:  "{{ ansible_playbook_python | default('<unset>') }}"
+          - ansible_skip_tags:        "{{ ansible_skip_tags | default('<unset>') }}"
+          - ansible_version.full:     "{{ ansible_version.full | default('<unset>') }}"
+          - is_mitogen:               "{{ is_mitogen | default('<unset>') }}"
+          - playbook_dir:             "{{ playbook_dir | default('<unset>') }}"
diff --git a/tests/ansible/setup/report.yml b/tests/ansible/setup/report_targets.yml
similarity index 73%
rename from tests/ansible/setup/report.yml
rename to tests/ansible/setup/report_targets.yml
index 450e4fb0..5aa67124 100644
--- a/tests/ansible/setup/report.yml
+++ b/tests/ansible/setup/report_targets.yml
@@ -1,4 +1,4 @@
-- name: Report runtime settings
+- name: Report target facts
   hosts: localhost:test-targets
   gather_facts: true
   tasks:
@@ -13,8 +13,3 @@
     - debug: {var: ansible_facts.osversion}
     - debug: {var: ansible_facts.python}
     - debug: {var: ansible_facts.system}
-    - debug: {var: ansible_forks}
-    - debug: {var: ansible_run_tags}
-    - debug: {var: ansible_skip_tags}
-    - debug: {var: ansible_version.full}
-    - debug: {var: is_mitogen}
diff --git a/tests/image_prep/_user_accounts.yml b/tests/image_prep/_user_accounts.yml
index 6224b61a..9472d099 100644
--- a/tests/image_prep/_user_accounts.yml
+++ b/tests/image_prep/_user_accounts.yml
@@ -4,6 +4,8 @@
 # WARNING: this creates non-privilged accounts with pre-set passwords!
 #
 
+- import_playbook: ../ansible/setup/report_controller.yml
+
 - hosts: all
   gather_facts: true
   strategy: mitogen_free