diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
index 3bae663847..9e72b26ab2 100644
--- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
@@ -159,7 +159,7 @@ c['schedulers'].append(ForceScheduler(
 from buildbot.process.factory import BuildFactory
 from buildbot.steps.source.git import Git
 from buildbot.steps.shell import ShellCommand
-from buildbot.process.properties import Interpolate
+from buildbot.process.properties import Property, Interpolate
 
 
 {#
@@ -192,7 +192,8 @@ def create_test_factory(repo_name, func=True):
                     method='clobber'))
     factory.addStep(ShellCommand(command=['virtualenv', '--system-site-packages', 'env']))
     factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; pip install -r requirements.txt']))
-    factory.addStep(ShellCommand(command=['bash', '-c', 'source env/bin/activate; TEST="true" py.test %s testing/' % '-F' if func else ''], name=repo_name))
+    factory.addStep(ShellCommand(command=['doit', 'test'])
+    factory.addStep(ShellCommand(command=['doit', Interpolate('basedir=/srv/static/%(prop:Project)s']))
 
     return factory
 
diff --git a/roles/taskotron/buildslave/tasks/main.yml b/roles/taskotron/buildslave/tasks/main.yml
index be287f3ab4..0c7304f5ec 100644
--- a/roles/taskotron/buildslave/tasks/main.yml
+++ b/roles/taskotron/buildslave/tasks/main.yml
@@ -16,6 +16,17 @@
     - moreutils
   when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
+- name: ensure packages required for CI buildslave are installed (dnf)
+  dnf: name={{ item }} state=present enablerepo={{ extra_enablerepos }}
+  with_items:
+    - testcloud
+    - mash
+    - mock
+    - koji
+    - bodhi
+    - python-doit
+  when: deployment_type in ['qa-stg'] and ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
+
 - name: add the buildslave user
   user: name=buildslave
   when: deployment_type in ['prod', 'stg', 'local', 'qa-stg']