diff --git a/docker/Dockerfile-tests b/docker/Dockerfile-tests
index 66dcc36c..24ee3a24 100644
--- a/docker/Dockerfile-tests
+++ b/docker/Dockerfile-tests
@@ -42,6 +42,7 @@ RUN yum -y install \
     python-solv \
     python-sqlalchemy \
     python-tox \
+    python2-distro \
     python2-libmodulemd2 \
     python2-pyyaml \
     python2-pungi \
diff --git a/docker/Dockerfile-tests-py3 b/docker/Dockerfile-tests-py3
index 45271258..089f4dac 100644
--- a/docker/Dockerfile-tests-py3
+++ b/docker/Dockerfile-tests-py3
@@ -9,6 +9,7 @@ RUN dnf -y install \
     git-core \
     createrepo_c \
     rsync \
+    python3-distro \
     python3-fedmsg \
     python3-kobo-rpmlib \
     python3-rpm \
diff --git a/module_build_service/builder/KojiContentGenerator.py b/module_build_service/builder/KojiContentGenerator.py
index 17347afc..faea8ce2 100644
--- a/module_build_service/builder/KojiContentGenerator.py
+++ b/module_build_service/builder/KojiContentGenerator.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
 import calendar
+import distro
 import hashlib
 import logging
 import json
@@ -293,12 +294,12 @@ class KojiContentGenerator(object):
 
     def _get_buildroot(self):
         version = pkg_resources.get_distribution("module-build-service").version
-        distro = platform.linux_distribution()
+        distro_info = distro.linux_distribution()
         ret = {
             u"id": 1,
             u"host": {
                 u"arch": text_type(platform.machine()),
-                u"os": u"%s %s" % (distro[0], distro[1]),
+                u"os": u"%s %s" % (distro_info[0], distro_info[1]),
             },
             u"content_generator": {
                 u"name": u"module-build-service",
diff --git a/requirements.txt b/requirements.txt
index b20389fb..da805b96 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,11 @@
+distro
+dogpile.cache
 enum34
+fedmsg
 Flask
 Flask-Migrate
-Flask-SQLAlchemy
 Flask-Script
-dogpile.cache
-fedmsg
+Flask-SQLAlchemy
 funcsigs # Python2 only
 futures # Python 2 only
 kobo>=0.5.0
@@ -13,8 +14,8 @@ ldap3
 moksha.hub
 munch
 prometheus_client
-pyOpenSSL
 pygobject
+pyOpenSSL
 requests
 six
 sqlalchemy
diff --git a/tests/test_content_generator.py b/tests/test_content_generator.py
index 6b98f737..9a1ca386 100644
--- a/tests/test_content_generator.py
+++ b/tests/test_content_generator.py
@@ -77,7 +77,7 @@ class TestBuild:
     @patch("subprocess.Popen")
     @patch("module_build_service.builder.KojiContentGenerator.Modulemd")
     @patch("pkg_resources.get_distribution")
-    @patch("platform.linux_distribution")
+    @patch("distro.linux_distribution")
     @patch("platform.machine")
     @patch(
         "module_build_service.builder.KojiContentGenerator.KojiContentGenerator._koji_rpms_in_tag"
@@ -142,7 +142,7 @@ class TestBuild:
     @patch("subprocess.Popen")
     @patch("module_build_service.builder.KojiContentGenerator.Modulemd")
     @patch("pkg_resources.get_distribution")
-    @patch("platform.linux_distribution")
+    @patch("distro.linux_distribution")
     @patch("platform.machine")
     @patch(
         "module_build_service.builder.KojiContentGenerator.KojiContentGenerator._koji_rpms_in_tag"