Enable linting unconditionally
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2244de3..17f41dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,7 @@
 
   # Run the tests from the source distribution, We run as a simple
   # user to test for permission issues
-  - su buildstream -c 'python3 setup.py test --index-url invalid://uri --addopts --integration'
+  - su buildstream -c 'python3 setup.py test --index-url invalid://uri --addopts --integration -m "not (pep8 or pylint)"'
 
   # Go back to the toplevel and collect our reports
   - cd ../..
@@ -119,7 +119,7 @@
     - cd dist && ./unpack.sh && cd buildstream
 
     # Since the unix platform is required to run as root, no user change required
-    - python3 setup.py test --index-url invalid://uri --addopts --integration
+    - python3 setup.py test --index-url invalid://uri --addopts --integration -m "not (pep8 or pylint)"
 
     # Go back to the toplevel and collect our reports
     - cd ../..
diff --git a/setup.cfg b/setup.cfg
index 4540ae9..712413b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,7 +2,7 @@
 test=pytest
 
 [tool:pytest]
-addopts = --verbose --basetemp ./tmp --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc
+addopts = --verbose --basetemp ./tmp --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --pep8 --pylint
 norecursedirs = integration-cache tmp __pycache__ .eggs
 python_files = tests/*/*.py
 pep8maxlinelength = 119