diff --git a/tests/test_style.py b/tests/test_style.py
index ea10054..c7d74f5 100644
--- a/tests/test_style.py
+++ b/tests/test_style.py
@@ -18,6 +18,7 @@ import subprocess
 import sys
 import unittest
 
+import six
 
 REPO_PATH = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', 'pagure'))
@@ -31,12 +32,32 @@ class TestStyle(unittest.TestCase):
         This test runs flake8 on the code, and will fail if it returns a non-zero exit code.
         """
         # We ignore E712, which disallows non-identity comparisons with True and False
+        # We ignore W503, which disallows line break before binary operator
         flake8_command = [sys.executable, '-m', 'flake8', '--ignore=E712,W503', REPO_PATH]
         proc = subprocess.Popen(flake8_command, stdout=subprocess.PIPE)
         print(proc.communicate())
 
         self.assertEqual(proc.returncode, 0)
 
+    @unittest.skipIf(
+        not (six.PY3 and sys.version_info.minor >=6),
+        "Black is only available in python 3.6+")
+    def test_code_with_black(self):
+        """Enforce black compliance on the codebase.
+
+        This test runs black on the code, and will fail if it returns a non-zero exit code.
+        """
+        black_command = [sys.executable, '-m', 'black', '-l', '79', '--check', REPO_PATH]
+        proc = subprocess.Popen(
+            black_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        stdout, stderr = proc.communicate()
+        print('stdout: ')
+        print(stdout.decode('utf-8'))
+        print('stderr: ')
+        print(stderr.decode('utf-8'))
+
+        self.assertEqual(proc.returncode, 0)
+
 
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/tests_requirements.txt b/tests_requirements.txt
index 6b66bfe..beb0a12 100644
--- a/tests_requirements.txt
+++ b/tests_requirements.txt
@@ -1,5 +1,6 @@
 bcrypt
 beautifulsoup4
+black; python_version >= '3.6' # Only available on py3.6+
 cryptography
 eventlet
 fedmsg