diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1bc87f19a75ebeec1b0f4efc381c15a59272730c..7e7082bea28cdf1f70e7264dbee11f371cd3c204 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,14 @@ stages:
 before_script:
 - pip install -e .[dev]
 
+linting:
+  image: python:3.6
+  tags:
+  - passoft
+  stage: test
+  script:
+  - flake8 --ignore=F403,F405,F821,F841,W504 mseedpeek
+
 python3.6:
   image: python:3.6
   tags:
diff --git a/tox.ini b/tox.ini
index bf6c0725b91a09d47ebc02bcfec374415d4ecfc9..86082c8d69669cefe7b963758654dd27a25d4971 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,10 @@
 [tox]
-envlist = py36, py37, py38
+envlist = py36, py37, py38, flake8
+
+[testenv:flake8]
+basepython = python
+deps = flake8
+commands = flake8 --ignore=F403,F405,F821,F841,W504 mseedpeek
 
 [testenv]
 commands = python -m unittest