diff --git a/roles/emit-job-header/tasks/main.yaml b/roles/emit-job-header/tasks/main.yaml
index 7d08bf666..a2d8b70aa 100644
--- a/roles/emit-job-header/tasks/main.yaml
+++ b/roles/emit-job-header/tasks/main.yaml
@@ -19,3 +19,15 @@
           {% if zuul_log_url is defined and zuul_log_path is defined %}
           Log URL (when completed): {{ zuul_log_url }}/{{ zuul_log_path }}
           {% endif %}
+
+    - name: Print node information
+      debug:
+        msg: |
+          # Node Information
+          Hostname: {{ hostvars[item]['ansible_hostname'] }}
+          Provider: {{ hostvars[item]['nodepool']['provider'] }}
+          Label: {{ hostvars[item]['nodepool']['label'] }}
+          {% if hostvars[item]['nodepool']['interface_ip'] is defined %}
+          Interface IP: {{ hostvars[item]['nodepool']['interface_ip'] }}
+          {% endif %}
+      loop: "{{ query('inventory_hostnames', 'all,!localhost') }}"
diff --git a/roles/test-emit-job-header/README.rst b/roles/test-emit-job-header/README.rst
deleted file mode 100644
index bdb97c7ed..000000000
--- a/roles/test-emit-job-header/README.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-Log a few lines about the job.
-
-**Role Variables**
-
-.. zuul:rolevar:: zuul_log_url
-
-   Base URL where logs are to be found.
diff --git a/roles/test-emit-job-header/tasks/main.yaml b/roles/test-emit-job-header/tasks/main.yaml
deleted file mode 100644
index a2d8b70aa..000000000
--- a/roles/test-emit-job-header/tasks/main.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# We don't want this to run for every host, it should only run once.
-- run_once: yes
-  block:
-    - name: Setup log path fact
-      include_role:
-        name: set-zuul-log-path-fact
-
-    - name: Print job information
-      debug:
-        msg: |
-          # Job Information
-          Ansible Version: {{ ansible_version['full'] }}
-          Job: {{ zuul.job }}
-          Pipeline: {{ zuul.pipeline }}
-          Executor: {{ zuul.executor.hostname }}
-          {% if zuul.change_url is defined %}
-          Triggered by: {{ zuul.change_url }}
-          {% endif %}
-          {% if zuul_log_url is defined and zuul_log_path is defined %}
-          Log URL (when completed): {{ zuul_log_url }}/{{ zuul_log_path }}
-          {% endif %}
-
-    - name: Print node information
-      debug:
-        msg: |
-          # Node Information
-          Hostname: {{ hostvars[item]['ansible_hostname'] }}
-          Provider: {{ hostvars[item]['nodepool']['provider'] }}
-          Label: {{ hostvars[item]['nodepool']['label'] }}
-          {% if hostvars[item]['nodepool']['interface_ip'] is defined %}
-          Interface IP: {{ hostvars[item]['nodepool']['interface_ip'] }}
-          {% endif %}
-      loop: "{{ query('inventory_hostnames', 'all,!localhost') }}"