diff --git a/tests/test_style.py b/tests/test_style.py
new file mode 100644
index 0000000..74c1333
--- /dev/null
+++ b/tests/test_style.py
@@ -0,0 +1,24 @@
+import os
+import subprocess
+import unittest
+
+
+REPO_PATH = os.path.abspath(
+    os.path.join(os.path.dirname(__file__), '..', 'pagure'))
+
+
+class TestStyle(unittest.TestCase):
+    """This test class contains tests pertaining to code style."""
+    def test_code_with_flake8(self):
+        """Enforce PEP-8 compliance on the codebase.
+
+        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
+        flake8_command = ['flake8', '--ignore=E712,W503', REPO_PATH]
+
+        self.assertEqual(subprocess.call(flake8_command), 0)
+
+
+if __name__ == '__main__':
+    unittest.main(verbosity=2)