diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12c39156..210bbbc2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,6 +107,22 @@ pyup_io_safety_check:
     - pip install safety
     - safety check --full-report
 
+pylint:
+  image: alpine:3.7
+  variables:
+    LANG: C.UTF-8
+  script:
+    - apk add --no-cache ca-certificates python3
+    - python3 -m ensurepip
+    - pip3 install pylint
+    - pylint --rcfile=.pylint-rcfile --output-format=colorized --reports=n
+            fdroid
+            makebuildserver
+            setup.py
+            fdroidserver/*.py
+            tests/*.py
+            tests/*.TestCase
+
 fedora_latest:
   image: fedora:latest
   only:
diff --git a/tests/complete-ci-tests b/tests/complete-ci-tests
index c1c812b2..75fe515e 100755
--- a/tests/complete-ci-tests
+++ b/tests/complete-ci-tests
@@ -74,19 +74,3 @@ test -e $WORKSPACE/env/share/locale/de/LC_MESSAGES/fdroidserver.mo
 
 # run tests in new pip+pyvenv install
 fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
-
-
-#------------------------------------------------------------------------------#
-# run pylint
-
-# only run it where it will work, for example, the pyvenvs above don't have pylint
-if which pylint3 && python3 -c "import pylint" 2> /dev/null; then
-    cd $WORKSPACE
-    pylint3 --rcfile=.pylint-rcfile --output-format=colorized --reports=n \
-            fdroid \
-            makebuildserver \
-            setup.py \
-            fdroidserver/*.py \
-            tests/*.py \
-            tests/*.TestCase
-fi