diff --git a/roles/fetch-stestr-output/defaults/main.yaml b/roles/fetch-stestr-output/defaults/main.yaml
deleted file mode 100644
index a0afa22c5..000000000
--- a/roles/fetch-stestr-output/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-zuul_work_dir: "src/{{ zuul.project.canonical_name }}"
diff --git a/roles/fetch-stestr-output/tasks/main.yaml b/roles/fetch-stestr-output/tasks/main.yaml
deleted file mode 100644
index 3209c51c7..000000000
--- a/roles/fetch-stestr-output/tasks/main.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-- name: Register stestr directory
-  stat:
-    path: "{{ zuul_work_dir }}/.stestr"
-  register: stestr_stat
-
-- name: Process testr artifacts
-  include: process.yaml
-  when:
-    - stestr_stat.stat.exists
-
-- name: Collect test-results
-  synchronize:
-    dest: "{{ zuul.executor.log_root }}"
-    mode: pull
-    src: "{{ zuul_work_dir }}/{{ item }}"
-    verify_host: true
-  with_items:
-    - "*testr_results.html.gz"
-    - "*testrepository.subunit.gz"
-  when:
-    - stestr_stat.stat.exists
-  # some tox runs may not create test-results
-  failed_when: false
diff --git a/roles/fetch-stestr-output/tasks/process.yaml b/roles/fetch-stestr-output/tasks/process.yaml
deleted file mode 100644
index 96eabe173..000000000
--- a/roles/fetch-stestr-output/tasks/process.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-- name: Generate testrepository.subunit file
-  shell: ".tox/{{ tox_envlist }}/bin/stestr last --subunit > ./testrepository.subunit"
-  args:
-    chdir: "{{ zuul_work_dir }}"
-
-- name: Generate testr_results.html file
-  command: "/usr/os-testr-env/bin/subunit2html ./testrepository.subunit testr_results.html"
-  args:
-    chdir: "{{ zuul_work_dir }}"
-
-- name: Register testrepository.subunit file
-  stat:
-    path: "{{ zuul_work_dir }}/testrepository.subunit"
-  register: p
-
-- name: Compress testrepository.subunit file
-  archive:
-    path: "{{ p.stat.path }}"
-  when:
-    - p.stat.exists
-
-- name: Register testr_results.html file
-  stat:
-    path: "{{ zuul_work_dir }}/testr_results.html"
-  register: html
-
-- name: Compress testr_results.html file
-  archive:
-    path: "{{ html.stat.path }}"
-  when:
-    - html.stat.exists
diff --git a/roles/fetch-testr-output/defaults/main.yaml b/roles/fetch-testr-output/defaults/main.yaml
deleted file mode 100644
index a0afa22c5..000000000
--- a/roles/fetch-testr-output/defaults/main.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-zuul_work_dir: "src/{{ zuul.project.canonical_name }}"
diff --git a/roles/fetch-testr-output/tasks/main.yaml b/roles/fetch-testr-output/tasks/main.yaml
deleted file mode 100644
index 58b73f01d..000000000
--- a/roles/fetch-testr-output/tasks/main.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-- name: Register testrepository directory
-  stat:
-    path: "{{ zuul_work_dir }}/.testrepository"
-  register: testrepository_stat
-
-- name: Process testr artifacts
-  include: process.yaml
-  when:
-    - testrepository_stat.stat.exists
-
-- name: Collect test-results
-  synchronize:
-    dest: "{{ zuul.executor.log_root }}"
-    mode: pull
-    src: "{{ zuul_work_dir }}/{{ item }}"
-    verify_host: true
-  with_items:
-    - "*testr_results.html.gz"
-    - "*testrepository.subunit.gz"
-  when:
-    - testrepository_stat.stat.exists
-  # some tox runs may not create test-results
-  failed_when: false
diff --git a/roles/fetch-testr-output/tasks/process.yaml b/roles/fetch-testr-output/tasks/process.yaml
deleted file mode 100644
index 801b2ba69..000000000
--- a/roles/fetch-testr-output/tasks/process.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- name: Generate testrepository.subunit file
-  # TODO(pabelanger): We cannot depend on tox_envlist here!!!
-  shell: ".tox/{{ tox_envlist }}/bin/testr last --subunit > ./testrepository.subunit"
-  args:
-    chdir: "{{ zuul_work_dir }}"
-
-- name: Generate testr_results.html file
-  # TODO(pabelanger): We cannot depend on /usr/os-testr-env here!!!
-  command: "/usr/os-testr-env/bin/subunit2html ./testrepository.subunit testr_results.html"
-  args:
-    chdir: "{{ zuul_work_dir }}"
-
-- name: Register testrepository.subunit file
-  stat:
-    path: "{{ zuul_work_dir }}/testrepository.subunit"
-  register: p
-
-- name: Compress testrepository.subunit file
-  archive:
-    path: "{{ p.stat.path }}"
-  when:
-    - p.stat.exists
-
-- name: Register testr_results.html file
-  stat:
-    path: "{{ zuul_work_dir }}/testr_results.html"
-  register: html
-
-- name: Compress testr_results.html file
-  archive:
-    path: "{{ html.stat.path }}"
-  when:
-    - html.stat.exists