diff --git a/tests/ansible/bench/loop-20-templates.yml b/tests/ansible/bench/loop-20-templates.yml
index bae636ce..4035ea34 100644
--- a/tests/ansible/bench/loop-20-templates.yml
+++ b/tests/ansible/bench/loop-20-templates.yml
@@ -1,12 +1,14 @@
 - name: bench/loop-20-templates.yml
   hosts: all
   tasks:
-  - file:
+  - name: Create loop templates dir
+    file:
       dest: /tmp/templates
       state: "{{item}}"
     with_items: ["absent", "directory"]
 
-  - copy:
+  - name: Copy loop files
+    copy:
       dest: /tmp/templates/{{item}}
       mode: 0755
       content:
diff --git a/tests/ansible/integration/action/copy.yml b/tests/ansible/integration/action/copy.yml
index 8aae546a..5dadff9a 100644
--- a/tests/ansible/integration/action/copy.yml
+++ b/tests/ansible/integration/action/copy.yml
@@ -3,21 +3,22 @@
 - name: integration/action/copy.yml
   hosts: test-targets
   tasks:
-    - copy:
+    - name: Create tiny file
+      copy:
         dest: /tmp/copy-tiny-file
         content:
           this is a tiny file.
       delegate_to: localhost
 
-    - copy:
+    - name: Create large file
+      copy:
         dest: /tmp/copy-large-file
         # Must be larger than Connection.SMALL_SIZE_LIMIT.
         content: "{% for x in range(200000) %}x{% endfor %}"
       delegate_to: localhost
 
-    # end of making files
-
-    - file:
+    - name: Cleanup copied files
+      file:
         state: absent
         path: "{{item}}"
       with_items:
@@ -26,28 +27,31 @@
       - /tmp/copy-tiny-inline-file.out
       - /tmp/copy-large-inline-file.out
 
-    # end of cleaning out files
-
-    - copy:
+    - name: Copy large file
+      copy:
         dest: /tmp/copy-large-file.out
         src: /tmp/copy-large-file
 
-    - copy:
+    - name: Copy tiny file
+      copy:
         dest: /tmp/copy-tiny-file.out
         src: /tmp/copy-tiny-file
 
-    - copy:
+    - name: Copy tiny inline file
+      copy:
         dest: /tmp/copy-tiny-inline-file.out
         content: "tiny inline content"
 
-    - copy:
+    - name: Copy large inline file
+      copy:
         dest: /tmp/copy-large-inline-file.out
         content: |
           {% for x in range(200000) %}y{% endfor %}
 
     # stat results
 
-    - stat:
+    - name: Stat copied files
+      stat:
         path: "{{item}}"
       with_items:
       - /tmp/copy-tiny-file.out
@@ -64,7 +68,8 @@
         - stat.results[3].stat.checksum == "d675f47e467eae19e49032a2cc39118e12a6ee72"
         fail_msg: stat={{stat}}
 
-    - file:
+    - name: Cleanup files
+      file:
         state: absent
         path: "{{item}}"
       with_items:
diff --git a/tests/ansible/integration/action/fixup_perms2__copy.yml b/tests/ansible/integration/action/fixup_perms2__copy.yml
index 652974d3..fa4765f8 100644
--- a/tests/ansible/integration/action/fixup_perms2__copy.yml
+++ b/tests/ansible/integration/action/fixup_perms2__copy.yml
@@ -6,10 +6,6 @@
 - name: integration/action/fixup_perms2__copy.yml
   hosts: test-targets
   tasks:
-    #
-    # copy module (no mode).
-    #
-
     - name: "Copy files (no mode)"
       copy:
         content: ""
@@ -22,10 +18,6 @@
         -  out.stat.mode in ("0644", "0664")
         fail_msg: out={{out}}
 
-    #
-    # copy module (explicit mode).
-    #
-
     - name: "Copy files from content: arg"
       copy:
         content: ""
@@ -39,22 +31,20 @@
         -  out.stat.mode == "0400"
         fail_msg: out={{out}}
 
-    #
-    # copy module (existing disk files, no mode).
-    #
-
-    - file:
+    - name: Cleanup local weird mode file
+      file:
         path: /tmp/weird-mode.out
         state: absent
 
-    - name: Create local test file.
+    - name: Create local weird mode file
       delegate_to: localhost
       copy:
         content: "weird mode"
         dest: "/tmp/weird-mode"
         mode: "1462"
 
-    - copy:
+    - name: Copy file with weird mode
+      copy:
         src: "/tmp/weird-mode"
         dest: "/tmp/weird-mode.out"
 
@@ -66,11 +56,8 @@
         - out.stat.mode in ("0644", "0664")
         fail_msg: out={{out}}
 
-    #
-    # copy module (existing disk files, preserve mode).
-    #
-
-    - copy:
+    - name: Copy file with weird mode, preserving mode
+      copy:
         src: "/tmp/weird-mode"
         dest: "/tmp/weird-mode"
         mode: preserve
@@ -83,11 +70,8 @@
         - out.stat.mode == "1462"
         fail_msg: out={{out}}
 
-    #
-    # copy module (existing disk files, explicit mode).
-    #
-
-    - copy:
+    - name: Copy file with weird mode, explicit mode
+      copy:
         src: "/tmp/weird-mode"
         dest: "/tmp/weird-mode"
         mode: "1461"
@@ -101,7 +85,8 @@
         - out.stat.mode == "1461"
         fail_msg: out={{out}}
 
-    - file:
+    - name: Cleanup
+      file:
         state: absent
         path: "{{item}}"
       with_items:
diff --git a/tests/ansible/integration/action/remote_file_exists.yml b/tests/ansible/integration/action/remote_file_exists.yml
index 28952f93..577e64a0 100644
--- a/tests/ansible/integration/action/remote_file_exists.yml
+++ b/tests/ansible/integration/action/remote_file_exists.yml
@@ -2,36 +2,32 @@
 - name: integration/action/remote_file_exists.yml
   hosts: test-targets
   tasks:
-
-    - file:
+    - name: Ensure does-not-exist doesnt
+      file:
         path: /tmp/does-not-exist
         state: absent
-
     - action_passthrough:
         method: _remote_file_exists
         args: ['/tmp/does-not-exist']
       register: out
-
     - assert:
         that: out.result == False
         fail_msg: out={{out}}
 
-    # ---
-
-    - copy:
+    - name: Ensure does-exist does
+      copy:
         dest: /tmp/does-exist
         content: "I think, therefore I am"
-
     - action_passthrough:
         method: _remote_file_exists
         args: ['/tmp/does-exist']
       register: out
-
     - assert:
         that: out.result == True
         fail_msg: out={{out}}
 
-    - file:
+    - name: Cleanup
+      file:
         path: /tmp/does-exist
         state: absent
   tags:
diff --git a/tests/ansible/integration/action/remove_tmp_path.yml b/tests/ansible/integration/action/remove_tmp_path.yml
index 1df212c7..d90c90dc 100644
--- a/tests/ansible/integration/action/remove_tmp_path.yml
+++ b/tests/ansible/integration/action/remove_tmp_path.yml
@@ -10,7 +10,8 @@
     # return a result with a 'src' attribute pointing into that directory.
     #
 
-    - copy:
+    - name: Ensure remove_tmp_path_test
+      copy:
         dest: /tmp/remove_tmp_path_test
         content: "{{ 123123 | random }}"
       register: out
diff --git a/tests/ansible/integration/action/synchronize.yml b/tests/ansible/integration/action/synchronize.yml
index f17d8fb8..aa87deaf 100644
--- a/tests/ansible/integration/action/synchronize.yml
+++ b/tests/ansible/integration/action/synchronize.yml
@@ -12,23 +12,27 @@
     ansible_password: ''
   tasks:
     # must copy git file to set proper file mode.
-    - copy:
+    - name: Copy synchronize-action-key
+      copy:
         dest: /tmp/synchronize-action-key
         src: ../../../data/docker/mitogen__has_sudo_pubkey.key
         mode: u=rw,go=
       delegate_to: localhost
 
-    - file:
+    - name: Cleanup sync-test
+      file:
         path: /tmp/sync-test
         state: absent
       delegate_to: localhost
 
-    - file:
+    - name: Create sync-test
+      file:
         path: /tmp/sync-test
         state: directory
       delegate_to: localhost
 
-    - copy:
+    - name: Create syn-test item
+      copy:
         dest: /tmp/sync-test/item
         content: "item!"
       delegate_to: localhost
diff --git a/tests/ansible/integration/action/transfer_data.yml b/tests/ansible/integration/action/transfer_data.yml
index 343f45da..6d4faab5 100644
--- a/tests/ansible/integration/action/transfer_data.yml
+++ b/tests/ansible/integration/action/transfer_data.yml
@@ -2,47 +2,45 @@
 - name: integration/action/transfer_data.yml
   hosts: test-targets
   tasks:
-
-    - file:
+    - name: Cleanup transfer data
+      file:
         path: /tmp/transfer-data
         state: absent
 
-    # Ensure it JSON-encodes dicts.
-    - action_passthrough:
+    - name: Create JSON transfer data
+      action_passthrough:
         method: _transfer_data
         kwargs:
           remote_path: /tmp/transfer-data
           data: {
             "I am JSON": true
           }
-
-    - slurp:
+    - name: Slurp JSON transfer data
+      slurp:
         src: /tmp/transfer-data
       register: out
-
     - assert:
         that: |
           out.content|b64decode == '{"I am JSON": true}'
         fail_msg: out={{out}}
 
-
-    # Ensure it handles strings.
-    - action_passthrough:
+    - name: Create text transfer data
+      action_passthrough:
         method: _transfer_data
         kwargs:
           remote_path: /tmp/transfer-data
           data: "I am text."
-
-    - slurp:
+    - name: Slurp text transfer data
+      slurp:
         src: /tmp/transfer-data
       register: out
-
     - assert:
         that:
           out.content|b64decode == 'I am text.'
         fail_msg: out={{out}}
 
-    - file:
+    - name: Cleanup transfer data
+      file:
         path: /tmp/transfer-data
         state: absent
   tags:
diff --git a/tests/ansible/integration/async/result_binary_producing_json.yml b/tests/ansible/integration/async/result_binary_producing_json.yml
index 4df46e76..942b356a 100644
--- a/tests/ansible/integration/async/result_binary_producing_json.yml
+++ b/tests/ansible/integration/async/result_binary_producing_json.yml
@@ -37,7 +37,8 @@
     retries: 100000
     delay: 0
 
-  - slurp:
+  - name: Slurp async busy-poll
+    slurp:
       src: "{{ansible_user_dir}}/.ansible_async/{{job.ansible_job_id}}"
     register: result
 
diff --git a/tests/ansible/integration/async/result_shell_echo_hi.yml b/tests/ansible/integration/async/result_shell_echo_hi.yml
index d50a41b9..f327a965 100644
--- a/tests/ansible/integration/async/result_shell_echo_hi.yml
+++ b/tests/ansible/integration/async/result_shell_echo_hi.yml
@@ -4,14 +4,17 @@
   hosts: test-targets
   tasks:
 
-  - shell: echo hi; echo there >&2
+  - name: Async shell
+    shell: echo hi; echo there >&2
     async: 100
     poll: 0
     register: job
 
-  - shell: sleep 1
+  - name: Sleepy shell
+    shell: sleep 1
 
-  - slurp:
+  - name: Slurp async shell
+    slurp:
       src: "{{ansible_user_dir}}/.ansible_async/{{job.ansible_job_id}}"
     register: result
 
diff --git a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml
index a0fd125a..5678dbdd 100644
--- a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml
+++ b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml
@@ -5,7 +5,8 @@
 
   # Start 2 duplicate jobs, verify they run concurrently.
 
-  - file:
+  - name: Cleanup semaphore file
+    file:
       path: /tmp/flurp
       state: absent
 
diff --git a/tests/ansible/integration/connection/_put_file.yml b/tests/ansible/integration/connection/_put_file.yml
index 3092e199..fb5c6014 100644
--- a/tests/ansible/integration/connection/_put_file.yml
+++ b/tests/ansible/integration/connection/_put_file.yml
@@ -1,19 +1,23 @@
 ---
 
-- shell: dd if=/dev/urandom of=/tmp/{{file_name}} bs=1024 count={{file_size}}
+- name: Create {{ file_name }}
+  shell: dd if=/dev/urandom of=/tmp/{{ file_name }} bs=1024 count={{ file_size }}
   args:
     creates: /tmp/{{file_name}}
   delegate_to: localhost
 
-- copy:
+- name: Copy {{ file_name }}
+  copy:
     dest: /tmp/{{file_name}}.out
     src: /tmp/{{file_name}}
 
-- stat: path=/tmp/{{file_name}}
+- name: Stat created {{ file_name }}
+  stat: path=/tmp/{{ file_name }}
   register: original
   delegate_to: localhost
 
-- stat: path=/tmp/{{file_name}}.out
+- name: Stat copied {{ file_name }}
+  stat: path=/tmp/{{ file_name }}.out
   register: copied
 
 - assert:
diff --git a/tests/ansible/integration/connection/disconnect_during_module.yml b/tests/ansible/integration/connection/disconnect_during_module.yml
index 1c7b544a..5c74b0ed 100644
--- a/tests/ansible/integration/connection/disconnect_during_module.yml
+++ b/tests/ansible/integration/connection/disconnect_during_module.yml
@@ -9,10 +9,13 @@
   - meta: end_play
     when: not is_mitogen
 
-  - delegate_to: localhost
+  - name: Run _disconnect_during_module.yml
+    delegate_to: localhost
     command: |
       ansible-playbook
-      -i "{{MITOGEN_INVENTORY_FILE}}"
+      {% for inv in ansible_inventory_sources %}
+      -i "{{ inv }}"
+      {% endfor %}
       integration/connection/_disconnect_during_module.yml
     args:
       chdir: ../..
diff --git a/tests/ansible/integration/context_service/reconnection.yml b/tests/ansible/integration/context_service/reconnection.yml
index 4fc975a1..5ab2309f 100644
--- a/tests/ansible/integration/context_service/reconnection.yml
+++ b/tests/ansible/integration/context_service/reconnection.yml
@@ -13,7 +13,8 @@
       custom_python_detect_environment:
       register: old_become_env
 
-    - become: true
+    - name: Kill ssh process
+      become: true
       shell: |
         bash -c "( sleep 3; kill -9 {{ssh_account_env.pid}}; ) & disown"
 
diff --git a/tests/ansible/integration/context_service/remote_name.yml b/tests/ansible/integration/context_service/remote_name.yml
index 17ade617..79fb8dea 100644
--- a/tests/ansible/integration/context_service/remote_name.yml
+++ b/tests/ansible/integration/context_service/remote_name.yml
@@ -10,7 +10,8 @@
   - meta: end_play
     when: ansible_system != 'Linux'
 
-  - shell: 'cat /proc/$PPID/cmdline | tr \\0 \\n'
+  - name: Get cmdline
+    shell: 'cat /proc/$PPID/cmdline | tr \\0 \\n'
     register: out
   - debug: var=out
 
@@ -19,7 +20,8 @@
       - out.stdout is match('.*python([0-9.]+)?\(mitogen:[a-z]+@[^:]+:[0-9]+\)')
       fail_msg: out={{out}}
 
-  - shell: 'cat /proc/$PPID/cmdline | tr \\0 \\n'
+  - name: Get cmdline, with mitogen_mask_remote_name
+    shell: 'cat /proc/$PPID/cmdline | tr \\0 \\n'
     register: out
     vars:
       mitogen_mask_remote_name: true
diff --git a/tests/ansible/integration/glibc_caches/resolv_conf.yml b/tests/ansible/integration/glibc_caches/resolv_conf.yml
index e83ce38e..1b22b66c 100644
--- a/tests/ansible/integration/glibc_caches/resolv_conf.yml
+++ b/tests/ansible/integration/glibc_caches/resolv_conf.yml
@@ -15,12 +15,14 @@
         - ansible_facts.virtualization_type == "docker"
         - ansible_facts.python.version_info[:2] >= [2, 5]
 
-    - shell: cp /etc/resolv.conf /tmp/resolv.conf
+    - name: Backup resolv.conf
+      shell: cp /etc/resolv.conf /tmp/resolv.conf
       when:
         - ansible_facts.virtualization_type == "docker"
         - ansible_facts.python.version_info[:2] >= [2, 5]
 
-    - shell: echo > /etc/resolv.conf
+    - name: Truncate resolv.conf
+      shell: echo > /etc/resolv.conf
       when:
         - ansible_facts.virtualization_type == "docker"
         - ansible_facts.python.version_info[:2] >= [2, 5]
@@ -33,7 +35,8 @@
         - ansible_facts.virtualization_type == "docker"
         - ansible_facts.python.version_info[:2] >= [2, 5]
 
-    - shell: cat /tmp/resolv.conf > /etc/resolv.conf
+    - name: Restore resolv.conf
+      shell: cat /tmp/resolv.conf > /etc/resolv.conf
       when:
         - ansible_facts.virtualization_type == "docker"
         - ansible_facts.python.version_info[:2] >= [2, 5]
diff --git a/tests/ansible/integration/local/cwd_preserved.yml b/tests/ansible/integration/local/cwd_preserved.yml
index c1dfc99d..70aec613 100644
--- a/tests/ansible/integration/local/cwd_preserved.yml
+++ b/tests/ansible/integration/local/cwd_preserved.yml
@@ -7,7 +7,8 @@
 - name: integration/local/cwd_preserved.yml
   hosts: test-targets
   tasks:
-  - connection: local
+  - name: Get local cwd
+    connection: local
     command: pwd
     register: pwd
 
diff --git a/tests/ansible/integration/playbook_semantics/environment.yml b/tests/ansible/integration/playbook_semantics/environment.yml
index 69728981..eea000bd 100644
--- a/tests/ansible/integration/playbook_semantics/environment.yml
+++ b/tests/ansible/integration/playbook_semantics/environment.yml
@@ -3,7 +3,8 @@
 - name: integration/playbook_semantics/environment.yml
   hosts: test-targets
   tasks:
-    - shell: echo $SOME_ENV
+    - name: Echo $SOME_ENV
+      shell: echo $SOME_ENV
       environment:
         SOME_ENV: 123
       register: result
diff --git a/tests/ansible/integration/runner/_etc_environment_global.yml b/tests/ansible/integration/runner/_etc_environment_global.yml
index 7b769ef4..2d883d06 100644
--- a/tests/ansible/integration/runner/_etc_environment_global.yml
+++ b/tests/ansible/integration/runner/_etc_environment_global.yml
@@ -1,18 +1,21 @@
 # /etc/environment
 
-- file:
+- name: Remove /etc/environment
+  file:
     path: /etc/environment
     state: absent
   become: true
 
-- shell: echo $MAGIC_ETC_ENV
+- name: Check MAGIC_ETC_ENV without
+  shell: echo $MAGIC_ETC_ENV
   register: echo
 
 - assert:
     that: echo.stdout == ""
     fail_msg: echo={{echo}}
 
-- copy:
+- name: Create /etc/environment
+  copy:
     dest: /etc/environment
     content: |
       MAGIC_ETC_ENV=555
@@ -23,14 +26,16 @@
 #- mitogen_shutdown_all:
   #when: not is_mitogen
 
-- shell: echo $MAGIC_ETC_ENV
+- name: Check MAGIC_ETC_ENV with
+  shell: echo $MAGIC_ETC_ENV
   register: echo
 
 - assert:
     that: echo.stdout == "555"
     fail_msg: echo={{echo}}
 
-- file:
+- name: Cleanup /etc/environment
+  file:
     path: /etc/environment
     state: absent
   become: true
@@ -40,7 +45,8 @@
 - mitogen_shutdown_all:
   when: not is_mitogen
 
-- shell: echo $MAGIC_ETC_ENV
+- name: Check MAGIC_ETC_ENV without+shutdown
+  shell: echo $MAGIC_ETC_ENV
   register: echo
 
 - assert:
diff --git a/tests/ansible/integration/runner/_etc_environment_user.yml b/tests/ansible/integration/runner/_etc_environment_user.yml
index 9d9b831a..939ee8dc 100644
--- a/tests/ansible/integration/runner/_etc_environment_user.yml
+++ b/tests/ansible/integration/runner/_etc_environment_user.yml
@@ -1,6 +1,7 @@
 # ~/.pam_environment
 
-- file:
+- name: Remove pam_environment
+  file:
     path: ~/.pam_environment
     state: absent
 
@@ -11,7 +12,8 @@
     that: echo.stdout == ""
     fail_msg: echo={{echo}}
 
-- copy:
+- name: Copy pam_environment
+  copy:
     dest: ~/.pam_environment
     content: |
       MAGIC_PAM_ENV=321
@@ -23,7 +25,8 @@
     that: echo.stdout == "321"
     fail_msg: echo={{echo}}
 
-- file:
+- name: Cleanup pam_environment
+  file:
     path: ~/.pam_environment
     state: absent
 
diff --git a/tests/ansible/integration/runner/atexit.yml b/tests/ansible/integration/runner/atexit.yml
index 65673561..75509877 100644
--- a/tests/ansible/integration/runner/atexit.yml
+++ b/tests/ansible/integration/runner/atexit.yml
@@ -9,20 +9,16 @@
   vars:
     path: /tmp/atexit-should-delete-this
   tasks:
-
-    #
-    # Verify a run with a healthy atexit handler. Broken handlers cause an
-    # exception to be raised.
-    #
-
-    - custom_python_run_script:
+    - name: Verify a run with a healthy atexit handler
+      custom_python_run_script:
         script: |
           import atexit, os, shutil
           path = '{{path}}'
           os.mkdir(path, int('777', 8))
           atexit.register(shutil.rmtree, path)
 
-    - stat:
+    - name: Stat atexit file
+      stat:
         path: "{{path}}"
       register: out
 
diff --git a/tests/ansible/integration/runner/builtin_command_module.yml b/tests/ansible/integration/runner/builtin_command_module.yml
index 70ed94ba..06e058cd 100644
--- a/tests/ansible/integration/runner/builtin_command_module.yml
+++ b/tests/ansible/integration/runner/builtin_command_module.yml
@@ -3,7 +3,8 @@
   hosts: test-targets
   gather_facts: true
   tasks:
-    - command: hostname
+    - name: Run hostname
+      command: hostname
       with_sequence: start=1 end={{end|default(1)}}
       register: out
 
diff --git a/tests/ansible/integration/runner/environment_isolation.yml b/tests/ansible/integration/runner/environment_isolation.yml
index c3e7b16e..b195a469 100644
--- a/tests/ansible/integration/runner/environment_isolation.yml
+++ b/tests/ansible/integration/runner/environment_isolation.yml
@@ -1,51 +1,38 @@
 # issue #309: ensure process environment is restored after a module runs.
 
-
 - name: integration/runner/environment_isolation.yml
   hosts: test-targets
   gather_facts: true
   tasks:
-
-    # ---
-    # Verify custom env setting is cleared out.
-    # ---
-
-    # Verify sane state first.
-    - custom_python_detect_environment:
+    - name: Verify custom env setting is cleared, control
+      custom_python_detect_environment:
       register: out
     - assert:
         that: not out.env.evil_key is defined
         fail_msg: out={{out}}
-
-    - shell: echo 'hi'
+    - name: Verify custom env setting is cleared, with evil_key
+      shell: echo 'hi'
       environment:
         evil_key: evil
-
-    # Verify environment was cleaned up.
-    - custom_python_detect_environment:
+    - name: Verify custom env setting is cleared, without evil_key
+      custom_python_detect_environment:
       register: out
     - assert:
         that: not out.env.evil_key is defined
         fail_msg: out={{out}}
 
-
-    # ---
-    # Verify non-explicit module env mutations are cleared out.
-    # ---
-
-    # Verify sane state first.
-    - custom_python_detect_environment:
+    - name: Verify non-explicit module env mutations are cleared, control
+      custom_python_detect_environment:
       register: out
     - assert:
         that: not out.env.evil_key is defined
         fail_msg: out={{out}}
-
-    - custom_python_modify_environ:
+    - name: Verify non-explicit module env mutations are cleared, mutate evil_key
+      custom_python_modify_environ:
         key: evil_key
         val: evil
-
-    # Verify environment was cleaned up.
-    - custom_python_detect_environment:
+    - name: Verify non-explicit module env mutations are cleared, without evil_key
+      custom_python_detect_environment:
       register: out
     - assert:
         that: not out.env.evil_key is defined
diff --git a/tests/ansible/integration/runner/missing_module.yml b/tests/ansible/integration/runner/missing_module.yml
index 676012d9..baa56b8b 100644
--- a/tests/ansible/integration/runner/missing_module.yml
+++ b/tests/ansible/integration/runner/missing_module.yml
@@ -3,7 +3,8 @@
   hosts: test-targets[0]
   connection: local
   tasks:
-    - connection: local
+    - name: Run missing_module
+      connection: local
       command: |
         ansible -vvv
         -i "{{MITOGEN_INVENTORY_FILE}}"
diff --git a/tests/ansible/integration/ssh/timeouts.yml b/tests/ansible/integration/ssh/timeouts.yml
index d697905a..24b1c5bb 100644
--- a/tests/ansible/integration/ssh/timeouts.yml
+++ b/tests/ansible/integration/ssh/timeouts.yml
@@ -3,7 +3,8 @@
 - name: integration/ssh/timeouts.yml
   hosts: test-targets
   tasks:
-    - connection: local
+    - name: Cause Ansible connection timeout
+      connection: local
       command: |
         ansible -vvv
         -i "{{MITOGEN_INVENTORY_FILE}}"
@@ -16,7 +17,8 @@
       ignore_errors: true
       when: is_mitogen
 
-    - assert:
+    - name: Verify connection timeout occurred
+      assert:
         that:
         - |
           '"changed": false' in out.stdout
diff --git a/tests/ansible/integration/stub_connections/setns_lxc.yml b/tests/ansible/integration/stub_connections/setns_lxc.yml
index 44717504..75d4207b 100644
--- a/tests/ansible/integration/stub_connections/setns_lxc.yml
+++ b/tests/ansible/integration/stub_connections/setns_lxc.yml
@@ -13,7 +13,8 @@
 
     - include: _end_play_if_not_sudo_linux.yml
 
-    - command: |
+    - name: Run stub-lxc-info.py
+      command: |
         sudo -nE "{{lookup('env', 'VIRTUAL_ENV')}}/bin/ansible"
         -i localhost,
         -c setns
diff --git a/tests/ansible/integration/stub_connections/setns_lxd.yml b/tests/ansible/integration/stub_connections/setns_lxd.yml
index 841f7805..3f3bc291 100644
--- a/tests/ansible/integration/stub_connections/setns_lxd.yml
+++ b/tests/ansible/integration/stub_connections/setns_lxd.yml
@@ -13,7 +13,8 @@
 
     - include: _end_play_if_not_sudo_linux.yml
 
-    - command: |
+    - name: Run ansible stub-lxc.py
+      command: |
         sudo -nE "{{lookup('env', 'VIRTUAL_ENV')}}/bin/ansible"
         -i localhost,
         -c setns
diff --git a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml
index 5343989c..e6677e2d 100644
--- a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml
+++ b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml
@@ -9,8 +9,8 @@
       when:
         - ansible_version.full is version('2.6', '<', strict=True)
 
-    # Copy the naughty 'ansible' into place.
-    - copy:
+    - name: Copy the naughty ansible into place
+      copy:
         dest: "{{ansible_user_dir}}/ansible.py"
         src: ansible.py
 
@@ -20,15 +20,15 @@
     - custom_python_detect_environment:
       register: env
 
-    # Verify interpreter config would actually trigger the bug.
-    - assert:
+    - name: Verify interpreter config would actually trigger the bug
+      assert:
         that:
           - env.cwd == ansible_user_dir
           - (not env.mitogen_loaded) or (env.python_path.count("") == 1)
         fail_msg: env={{env}}
 
-    # Run some new-style modules that 'from ansible.module_utils...'
-    - stat:
+    - name: Run some new-style from ansible.module_utils... modules
+      stat:
         path: /
   tags:
     - issue_109
diff --git a/tests/ansible/regression/issue_140__thread_pileup.yml b/tests/ansible/regression/issue_140__thread_pileup.yml
index 23649f92..1f614634 100644
--- a/tests/ansible/regression/issue_140__thread_pileup.yml
+++ b/tests/ansible/regression/issue_140__thread_pileup.yml
@@ -17,7 +17,8 @@
   - name: Delete remote file tree
     file: path=/tmp/filetree.out state=absent
 
-  - file:
+  - name: Recreate file tree
+    file:
       state: directory
       path: /tmp/filetree.out
 
diff --git a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml
index c53d34e4..fe7f5f42 100644
--- a/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml
+++ b/tests/ansible/regression/issue_152__local_action_wrong_interpreter.yml
@@ -8,7 +8,8 @@
   connection: local
   tasks:
 
-    - copy:
+    - name: Create /tmp/issue_152_interpreter.sh
+      copy:
         dest: /tmp/issue_152_interpreter.sh
         mode: u+x
         content: |
@@ -26,7 +27,8 @@
           - out.env.CUSTOM_INTERPRETER == "1"
         fail_msg: out={{out}}
 
-    - file:
+    - name: Cleanup /tmp/issue_152_interpreter.sh
+      file:
         path: /tmp/issue_152_interpreter.sh
         state: absent
   tags:
diff --git a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml
index 34a57a8a..f4c47aba 100644
--- a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml
+++ b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml
@@ -7,11 +7,12 @@
 
     # Can't use pip module because it can't create virtualenvs, must call it
     # directly.
-    - shell: virtualenv /tmp/issue_152_virtualenv
+    - name: Create /tmp/issue_152_virtualenv
       environment:
         https_proxy: "{{ lookup('env', 'https_proxy')|default('') }}"
         no_proxy: "{{ lookup('env', 'no_proxy')|default('') }}"
         PATH: "{{ lookup('env', 'PATH') }}"
+      shell: virtualenv /tmp/issue_152_virtualenv
       when:
         - lout.python.version.full is version('2.7', '>=', strict=True)
 
@@ -29,7 +30,8 @@
       when:
         - lout.python.version.full is version('2.7', '>=', strict=True)
 
-    - file:
+    - name: Cleanup /tmp/issue_152_virtualenv
+      file:
         path: /tmp/issue_152_virtualenv
         state: absent
       when:
diff --git a/tests/ansible/regression/issue_177__copy_module_failing.yml b/tests/ansible/regression/issue_177__copy_module_failing.yml
index 948621d3..c8dfc635 100644
--- a/tests/ansible/regression/issue_177__copy_module_failing.yml
+++ b/tests/ansible/regression/issue_177__copy_module_failing.yml
@@ -2,7 +2,8 @@
   hosts: test-targets
   tasks:
 
-  - copy:
+  - name: Copy files
+    copy:
       src: /etc/{{item}}
       dest: /tmp/{{item}}
       mode: 0644
@@ -10,7 +11,8 @@
       - passwd
       - hosts
 
-  - file:
+  - name: Cleanup files
+    file:
       path: /tmp/{{item}}
       state: absent
     with_items:
diff --git a/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml b/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml
index 2433e566..be069b1e 100644
--- a/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml
+++ b/tests/ansible/regression/issue_332_ansiblemoduleerror_first_occurrence.yml
@@ -4,7 +4,12 @@
 - name: regression/issue_332_ansiblemoduleerror_first_occurrence.yml
   hosts: test-targets
   tasks:
-  - file: path=/usr/bin/does-not-exist mode='a-s' state=file follow=yes
+  - name: Attempt to modify /usr/bin/does-not-exist
+    file:
+      path: /usr/bin/does-not-exist
+      mode: a-s
+      state: file
+      follow: true
     ignore_errors: true
     register: out
 
diff --git a/tests/ansible/regression/issue_558_unarchive_failed.yml b/tests/ansible/regression/issue_558_unarchive_failed.yml
index 23e9caad..829101cb 100644
--- a/tests/ansible/regression/issue_558_unarchive_failed.yml
+++ b/tests/ansible/regression/issue_558_unarchive_failed.yml
@@ -4,9 +4,16 @@
 - name: regression/issue_558_unarchive_failed.yml
   hosts: test-targets
   tasks:
-  - file: state=absent path=/tmp/foo
-  - file: state=directory path=/tmp/foo
-  - unarchive:
+  - name: Cleanup /tmp/foo
+    file:
+      path: /tmp/foo
+      state: absent
+  - name: Create /tmp/foo
+    file:
+      path: /tmp/foo
+      state: directory
+  - name: Unarchive unarchive_test.tar
+    unarchive:
       src: "{{git_basedir}}/tests/data/unarchive_test.tar"
       dest: /tmp/foo
     # garbage doesn't work with BSD tar
diff --git a/tests/ansible/regression/issue_590__sys_modules_crap.yml b/tests/ansible/regression/issue_590__sys_modules_crap.yml
index bd4334b0..476701e3 100644
--- a/tests/ansible/regression/issue_590__sys_modules_crap.yml
+++ b/tests/ansible/regression/issue_590__sys_modules_crap.yml
@@ -1,4 +1,4 @@
-- name: regression/iss590__sys_modules_crap.yml
+- name: regression/issue_590__sys_modules_crap.yml
   hosts: test-targets
   tasks:
   - meta: end_play
diff --git a/tests/ansible/regression/issue_615__streaming_transfer.yml b/tests/ansible/regression/issue_615__streaming_transfer.yml
index 1c69914d..8ec28499 100644
--- a/tests/ansible/regression/issue_615__streaming_transfer.yml
+++ b/tests/ansible/regression/issue_615__streaming_transfer.yml
@@ -9,19 +9,23 @@
     mitogen_ssh_compression: false
   tasks:
     - block:
-        - shell: |
+        - name: Create /tmp/512mb.zero
+          shell: |
             dd if=/dev/zero of=/tmp/512mb.zero bs=1048576 count=512;
             chmod go= /tmp/512mb.zero
 
-        - fetch:
+        - name: Fetch /tmp/512mb.zero
+          fetch:
             src: /tmp/512mb.zero
             dest: /tmp/fetch-out
 
-        - file:
+        - name: Cleanup /tmp/512mb.zero
+          file:
             path: /tmp/512mb.zero
             state: absent
 
-        - file:
+        - name: Cleanup fetched file
+          file:
             path: /tmp/fetch-out
             state: absent
           become: false
diff --git a/tests/ansible/soak/_file_service_loop.yml b/tests/ansible/soak/_file_service_loop.yml
index 96111b3c..474abd07 100644
--- a/tests/ansible/soak/_file_service_loop.yml
+++ b/tests/ansible/soak/_file_service_loop.yml
@@ -1,6 +1,8 @@
-  - file:
+  - name: Delete existing /tmp/foo-<inventory_hostname>
+    file:
       path: /tmp/foo-{{inventory_hostname}}
       state: absent
-  - copy:
+  - name: Create /tmp/foo-<inventory_hostname>
+    copy:
       dest: /tmp/foo-{{inventory_hostname}}
       content: "{{content}}"