diff --git a/tests/ansible/hosts/default.hosts b/tests/ansible/hosts/default.hosts
index 8ed80787..e2a13b47 100644
--- a/tests/ansible/hosts/default.hosts
+++ b/tests/ansible/hosts/default.hosts
@@ -25,11 +25,10 @@ tt-bare
 
 [tt_targets_bare:vars]
 ansible_host=localhost
-ansible_user=mitogen__has_sudo_nopw
 
 [tt_targets_inventory]
-tt-password                 ansible_password="{{ 'has_sudo_nopw_password' | trim }}"
+tt-password                 ansible_password="{{ 'has_sudo_nopw_password' | trim }}" ansible_user=mitogen__has_sudo_nopw
+tt-remote-user              ansible_password=has_sudo_nopw_password ansible_user="{{ 'mitogen__has_sudo_nopw' | trim }}"
 
 [tt_targets_inventory:vars]
 ansible_host=localhost
-ansible_user=mitogen__has_sudo_nopw
diff --git a/tests/ansible/integration/ssh/templated_by_play_taskvar.yml b/tests/ansible/integration/ssh/templated_by_play_taskvar.yml
index bc4ef1d8..5a937fb9 100644
--- a/tests/ansible/integration/ssh/templated_by_play_taskvar.yml
+++ b/tests/ansible/integration/ssh/templated_by_play_taskvar.yml
@@ -3,6 +3,7 @@
   gather_facts: false
   vars:
     ansible_password: "{{ 'has_sudo_nopw_password' | trim }}"
+    ansible_user: "{{ 'mitogen__has_sudo_nopw' | trim }}"
 
   tasks:
     - meta: reset_connection
diff --git a/tests/ansible/templates/test-targets.j2 b/tests/ansible/templates/test-targets.j2
index 37a0725a..1166cc42 100644
--- a/tests/ansible/templates/test-targets.j2
+++ b/tests/ansible/templates/test-targets.j2
@@ -47,12 +47,11 @@ tt-bare
 ansible_host={{ tt.hostname }}
 ansible_port={{ tt.port }}
 ansible_python_interpreter={{ tt.python_path }}
-ansible_user=mitogen__has_sudo_nopw
 
 [tt_targets_inventory]
-tt-password                 ansible_password="{{ '{{' }} 'has_sudo_nopw_password' | trim {{ '}}' }}"  ansible_port={{ tt.port }}
+tt-password                 ansible_password="{{ '{{' }} 'has_sudo_nopw_password' | trim {{ '}}' }}"  ansible_port={{ tt.port }} ansible_user=mitogen__has_sudo_nopw
+tt-remote-user              ansible_password=has_sudo_nopw_password  ansible_port={{ tt.port }} ansible_user="{{ '{{' }} 'mitogen__has_sudo_nopw' | trim {{ '}}' }}"
 
 [tt_targets_inventory:vars]
 ansible_host={{ tt.hostname }}
 ansible_python_interpreter={{ tt.python_path }}
-ansible_user=mitogen__has_sudo_nopw