diff --git a/playbooks/tox/tarball.yaml b/playbooks/tox/tarball.yaml
index 88d408bff..0f3fcfb8b 100644
--- a/playbooks/tox/tarball.yaml
+++ b/playbooks/tox/tarball.yaml
@@ -1,4 +1,6 @@
 - hosts: all
   roles:
-    - run-tarball
-    - run-wheel
+    - role: tox
+      tox_extra_args: -vv python setup.py sdist
+    - role: tox
+      tox_extra_args: -vv python setup.py bdist_wheel
diff --git a/roles/run-tarball/defaults/main.yaml b/roles/run-tarball/defaults/main.yaml
deleted file mode 100644
index 7a8e44269..000000000
--- a/roles/run-tarball/defaults/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-tox_envlist: venv
-zuul_work_dir: "src/{{ zuul.project.canonical_name }}"
diff --git a/roles/run-tarball/tasks/main.yaml b/roles/run-tarball/tasks/main.yaml
deleted file mode 100644
index 8fd5912d8..000000000
--- a/roles/run-tarball/tasks/main.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- name: Build a tarball
-  args:
-    chdir: "{{ zuul_work_dir }}"
-  shell: |
-    #!/bin/bash -xe
-
-    # Copyright 2013 OpenStack Foundation
-    #
-    # Licensed under the Apache License, Version 2.0 (the "License"); you may
-    # not use this file except in compliance with the License. You may obtain
-    # a copy of the License at
-    #
-    #      http://www.apache.org/licenses/LICENSE-2.0
-    #
-    # Unless required by applicable law or agreed to in writing, software
-    # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-    # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-    # License for the specific language governing permissions and limitations
-    # under the License.
-
-    venv={{ tox_envlist }}
-
-    rm -f dist/*.tar.gz
-    tox -e$venv python setup.py sdist
-
-    FILES=dist/*.tar.gz
-    for f in $FILES; do
-        echo "SHA1sum for $f:"
-        sha1sum $f | awk '{print $1}' > $f.sha1
-        cat $f.sha1
-
-        echo "MD5sum for $f:"
-        md5sum $f  | awk '{print $1}' > $f.md5
-        cat $f.md5
-    done
diff --git a/roles/run-wheel/defaults/main.yaml b/roles/run-wheel/defaults/main.yaml
deleted file mode 100644
index 7a8e44269..000000000
--- a/roles/run-wheel/defaults/main.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-tox_envlist: venv
-zuul_work_dir: "src/{{ zuul.project.canonical_name }}"
diff --git a/roles/run-wheel/tasks/main.yaml b/roles/run-wheel/tasks/main.yaml
deleted file mode 100644
index 16f544f71..000000000
--- a/roles/run-wheel/tasks/main.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- name: Build a wheel
-  args:
-    chdir: "{{ zuul_work_dir }}"
-  shell: |
-    #!/bin/bash -xe
-
-    # Copyright 2013 OpenStack Foundation
-    #
-    # Licensed under the Apache License, Version 2.0 (the "License"); you may
-    # not use this file except in compliance with the License. You may obtain
-    # a copy of the License at
-    #
-    #      http://www.apache.org/licenses/LICENSE-2.0
-    #
-    # Unless required by applicable law or agreed to in writing, software
-    # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-    # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-    # License for the specific language governing permissions and limitations
-    # under the License.
-
-    venv={{ tox_envlist }}
-
-    rm -f dist/*.whl
-    tox -e$venv pip install wheel
-    tox -e$venv python setup.py bdist_wheel
-
-    FILES=dist/*.whl
-    for f in $FILES; do
-        echo -n "SHA1sum for $f: "
-        sha1sum $f | awk '{print $1}' | tee $f.sha1
-
-        echo -n "MD5sum for $f: "
-        md5sum $f  | awk '{print $1}' | tee $f.md5
-    done