diff --git a/.github/workflows/main.yml b/.github/workflows/black.yml
similarity index 100%
rename from .github/workflows/main.yml
rename to .github/workflows/black.yml
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-runtests-basic.yml
similarity index 96%
rename from .github/workflows/python-package.yml
rename to .github/workflows/python-runtests-basic.yml
index 6089df8f..9552cda4 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-runtests-basic.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Python package
+name: Run unit tests (without image comparison)
 
 on:
   push:
diff --git a/.github/workflows/python-runtests-img-comp.yml b/.github/workflows/python-runtests-img-comp.yml
new file mode 100644
index 00000000..32628b68
--- /dev/null
+++ b/.github/workflows/python-runtests-img-comp.yml
@@ -0,0 +1,39 @@
+# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Run unit tests (with image comparison)
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: 3.8
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        if [ -f requirements_dev.txt ]; then pip install -r requirements_dev.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .git,docs/*
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        python check_wqio.py --strict
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 1c692275..faefb399 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -8,7 +8,6 @@ probscale
 pytest
 pytest-cov
 pytest-mpl
-pytest-pep8
 coverage
 docopt
 requests