diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f47a8262b..92e9d713ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -199,7 +199,6 @@ stages:
   before_script:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
     - test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
-    - pip3 install pytest requests || pip install pytest requests || true
   script:
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} -k all V=1
@@ -257,7 +256,6 @@ stages:
   before_script:
     - *setup_interfaces
     - *setup_softhsm
-    - pip3 install pytest requests || pip install pytest requests || true
   script:
     - cd bin/tests/system
     - make -j${TEST_PARALLEL_JOBS:-1} -k check V=1 || make -j${TEST_PARALLEL_JOBS:-1} -k recheck V=1
@@ -429,8 +427,6 @@ flake8:
   needs:
     - job: autoreconf
       artifacts: true
-  before_script:
-    - pip3 install flake8
   script:
     - *configure
     - flake8 --max-line-length=80 $(git ls-files '*.py' | grep -v 'ans\.py')
@@ -444,12 +440,9 @@ pylint:
   needs:
     - job: autoreconf
       artifacts: true
-  before_script:
-    - pip3 install pylint
-    - PYTHONPATH="$PYTHONPATH:$CI_PROJECT_DIR/bin/python"
-    - pip3 install pytest requests || pip install pytest requests
   script:
     - *configure
+    - PYTHONPATH="$PYTHONPATH:$CI_PROJECT_DIR/bin/python"
     - pylint --rcfile $CI_PROJECT_DIR/.pylintrc $(git ls-files '*.py' | grep -v 'ans\.py')
   only:
     - merge_requests
@@ -478,11 +471,6 @@ docs:
   before_script:
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
     - test -n "${OOT_BUILD_WORKSPACE}" && mkdir "${OOT_BUILD_WORKSPACE}" && cd "${OOT_BUILD_WORKSPACE}"
-    - pip3 install pytest requests || pip install pytest requests || true
-    - pip3 install sphinx sphinx_rtd_theme || pip install sphinx sphinx_rtd_theme
-    - apt -yqqq update
-    - apt -yqqq dist-upgrade
-    - apt -yqqq install texlive-full texlive-xetex latexmk xindy
   script:
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} -k maintainer-clean V=1
diff --git a/bin/tests/system/statschannel/helper.py b/bin/tests/system/statschannel/helper.py
index 7b53e9e9fe..ba6cf70134 100644
--- a/bin/tests/system/statschannel/helper.py
+++ b/bin/tests/system/statschannel/helper.py
@@ -79,9 +79,9 @@ def zone_mtime(zonedir, name):
 
 
 def zone_keyid(nameserver, zone, key):
-    with open(f'{nameserver}/{zone}.{key}.id') as f:
+    with open('{}/{}.{}.id'.format(nameserver, zone, key)) as f:
         keyid = f.read().strip()
-        print(f'{zone}-{key} ID: {keyid}')
+        print('{}-{} ID: {}'.format(zone, key, keyid))
     return keyid
 
 
diff --git a/configure.ac b/configure.ac
index 680645c565..d9a9c528f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,7 +280,7 @@ AM_CONDITIONAL([HAVE_PERLMOD_TIME_HIRES],
 AM_PATH_PYTHON([3.4], [], [:])
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ":"])
 
-AC_PATH_PROGS([PYTEST], [pytest-3 pytest pytest-pypy], [])
+AC_PATH_PROGS([PYTEST], [pytest-3 py.test-3 pytest pytest-pypy], [])
 AS_IF([test -z "$PYTEST"],
       [AC_MSG_WARN([pytest not found, some system tests will be skipped])])
 AC_SUBST([PYTEST])