diff --git a/inventory/group_vars/jenkins-dev b/inventory/group_vars/jenkins-dev
index f3aa3185aa..fe63734272 100644
--- a/inventory/group_vars/jenkins-dev
+++ b/inventory/group_vars/jenkins-dev
@@ -6,3 +6,165 @@ slaves:
 - name: EL6
   host: jenkins-el6.fedorainfracloud.org
   description: CentOS release 6.6
+
+# Packages installed on all Jenkins slaves (Fedora, CentOS)
+slave_packages_common:
+- java-1.8.0-openjdk-devel
+- vim
+- subversion
+- bzr
+- git
+- rpmlint
+- rpmdevtools
+- mercurial
+- mock
+- gcc
+- gcc-c++
+- libjpeg-turbo-devel
+- python-bugzilla
+- python-pip
+- python-virtualenv
+- python-coverage
+- pylint
+- python-argparse
+- python-nose
+- python-BeautifulSoup
+- python-fedora
+- python-unittest2
+- python-pep8
+- python-psycopg2
+- postgresql-devel   # Required to install python-psycopg2 w/in a venv
+- docbook-style-xsl  # Required by gimp-help-2
+- make               # Required by gimp-help-2
+- automake           # Required by gimp-help-2
+- libcurl-devel      # Required by blockerbugs
+- python-formencode  # Required by javapackages-tools
+- asciidoc           # Required by javapackages-tools
+- xmlto              # Required by javapackages-tools
+- pycairo-devel      # Required by dogtail
+- packagedb-cli      # Required by FedoraReview
+- xorg-x11-server-Xvfb  # Required by fedora-rube
+- libffi-devel       # Required by bodhi/cffi/cryptography
+- openssl-devel      # Required by bodhi/cffi/cryptography
+- redis              # Required by copr
+- createrepo_c       # Required by bodhi2
+- python-createrepo_c       # Required by bodhi2
+- python-straight-plugin
+- pyflakes           # Requested by user rholy (ticket #4175)
+- dia                # Required by javapackages-tools ticket #4279
+
+# Packages installed only on Fedora Jenkins slaves
+slave_packages_fedora:
+- python3
+- python-nose-cover3
+- python3-nose-cover3
+- glibc.i686
+- glibc-devel.i686
+- libstdc++.i686
+- zlib-devel.i686
+- ncurses-devel.i686
+- libX11-devel.i686
+- libXrender.i686
+- libXrandr.i686
+- nspr-devel           ## Requested by 389-ds-base
+- nss-devel
+- svrcore-devel
+- openldap-devel
+- libdb-devel
+- cyrus-sasl-devel
+- icu
+- libicu-devel
+- gcc-c++
+- net-snmp-devel
+- lm_sensors-devel
+- bzip2-devel
+- zlib-devel
+- openssl-devel
+- tcp_wrappers
+- pam-devel
+- systemd-units
+- policycoreutils-python
+- openldap-clients
+- perl-Mozilla-LDAP
+- nss-tools
+- cyrus-sasl-gssapi
+- cyrus-sasl-md5
+- libdb-utils
+- systemd-units
+- perl-Socket
+- perl-NetAddr-IP
+- pcre-devel            ## End of request list for 389-ds-base
+- maven                 # Required by xmvn https://fedorahosted.org/fedora-infrastructure/ticket/4054
+- gtk3-devel            # Required by dogtail
+- glib2-devel           # Required by Cockpit
+- libgudev1-devel
+- json-glib-devel
+- gobject-introspection-devel
+- libudisks2-devel
+- NetworkManager-glib-devel
+- systemd-devel
+- accountsservice-devel
+- pam-devel
+- autoconf
+- libtool
+- intltool
+- jsl
+- python-scss
+- gtk-doc
+- krb5-devel
+- sshpass
+- perl-Locale-PO
+- perl-JSON
+- glib-networking
+- realmd
+- udisks2
+- mdadm
+- lvm2
+- sshpass           # End requires for Cockpit
+- tito              # Requested by msrb for javapackages-tools and xmvn (ticket#4113)
+- pyflakes          # Requested by user rholy (ticket #4175)
+- devscripts-minimal # Required by FedoraReview
+- firefox           # Required for rube
+- python-devel      # Required for mpi4py
+- python3-devel     # Required for mpi4py
+- pwgen             # Required for mpi4py
+- openmpi-devel     # Required for mpi4py
+- mpich2-devel      # Required for mpi4py
+- pylint            # Required by Ipsilon
+- python-pep8
+- nodejs-less
+- python-openid
+- python-openid-teams
+- python-openid-cla
+- python-cherrypy
+- m2crypto
+- lasso-python
+- python-sqlalchemy
+- python-ldap
+- python-pam
+- python-fedora
+- freeipa-python
+- httpd
+- mod_auth_mellon
+- postgresql-server
+- openssl
+- mod_wsgi
+- python-jinja2
+- python-psycopg2
+- sssd
+- libsss_simpleifp
+- openldap-servers
+- mod_auth_gssapi
+- krb5-server
+- socket_wrapper
+- nss_wrapper
+- python-requests-kerberos
+- python-lesscpy     # End requires for Ipsilon
+- libxml2-python     # Required by gimp-docs
+- createrepo         # Required by dnf
+- sbt-extras
+
+# Packages installed only on CentOS Jenkins slaves
+slave_packages_centos:
+# el7-only
+#    - python-webob1.4   # Required by bodhi2
diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml
index a22d546d3c..fcf909a15f 100644
--- a/roles/jenkins/slave/tasks/main.yml
+++ b/roles/jenkins/slave/tasks/main.yml
@@ -1,8 +1,43 @@
-- name: install packages
+- name: install common slave packages (dnf)
+  dnf: name={{ item }} state=installed
+  with_items: {{ slave_packages_common }}
+  when: ansible_distribution_major_version|int > 21
+  tags:
+  - jenkins
+  - jenkins/slave
+  - packages
+
+- name: install common slave packages (yum)
   yum: name={{ item }} state=installed
-  with_items:
-  - java-1.8.0-openjdk-devel
-  # TODO: install more packages (copy from jenkins-cloud.yml)
+  with_items: {{ slave_packages_common }}
+  when: ansible_distribution_major_version|int < 22
+  tags:
+  - jenkins
+  - jenkins/slave
+  - packages
+
+- name: install distro-specific slave packages (fedora, dnf)
+  dnf: name={{ item }} state=installed
+  with_items: {{ slave_packages_fedora }}
+  when: is_fedora is defined and ansible_distribution_major_version|int > 21
+  tags:
+  - jenkins
+  - jenkins/slave
+  - packages
+
+- name: install distro-specific slave packages (fedora, yum)
+  yum: name={{ item }} state=installed
+  with_items: {{ slave_packages_fedora }}
+  when: is_fedora is defined and ansible_distribution_major_version|int < 22
+  tags:
+  - jenkins
+  - jenkins/slave
+  - packages
+
+- name: install distro-specific slave packages (centos, yum)
+  yum: name={{ item }} state=installed
+  with_items: {{ slave_packages_centos }}
+  when: is_fedora is not defined
   tags:
   - jenkins
   - jenkins/slave