diff --git a/tests/build.TestCase b/tests/build.TestCase
index ddefb947..b3b90fc3 100755
--- a/tests/build.TestCase
+++ b/tests/build.TestCase
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
 
diff --git a/tests/common.TestCase b/tests/common.TestCase
index 4ce09cae..48e1d29d 100755
--- a/tests/common.TestCase
+++ b/tests/common.TestCase
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
 
diff --git a/tests/complete-ci-tests b/tests/complete-ci-tests
index b536dc9e..8e781527 100755
--- a/tests/complete-ci-tests
+++ b/tests/complete-ci-tests
@@ -51,10 +51,10 @@ cd $WORKSPACE/tests
 #------------------------------------------------------------------------------#
 # test building the source tarball, then installing it
 cd $WORKSPACE
-python2 setup.py sdist
+python3 setup.py sdist
 
 rm -rf $WORKSPACE/env
-virtualenv --python=python2 $WORKSPACE/env
+virtualenv --python=python3 $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
 pip install dist/fdroidserver-*.tar.gz
 
@@ -66,10 +66,10 @@ fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
 # test install using install direct from git repo
 cd $WORKSPACE
 rm -rf $WORKSPACE/env
-virtualenv --python=python2 --system-site-packages $WORKSPACE/env
+virtualenv --python=python3 --system-site-packages $WORKSPACE/env
 . $WORKSPACE/env/bin/activate
 pip install -e $WORKSPACE
-python2 setup.py install
+python3 setup.py install
 
 # run tests in new pip+virtualenv install
 fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests $apksource
@@ -86,7 +86,7 @@ sh hooks/pre-commit
 cd $WORKSPACE
 set +e
 # use the virtualenv python so pylint checks against its installed libs
-    PYTHONPATH=$WORKSPACE/.pylint-plugins python2 /usr/bin/pylint \
+    PYTHONPATH=$WORKSPACE/.pylint-plugins python3 /usr/bin/pylint \
         --output-format=parseable --reports=n \
         --load-plugins astng_hashlib \
         fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable
diff --git a/tests/description-parsing.py b/tests/description-parsing.py
index 05eba4b9..780fae04 100755
--- a/tests/description-parsing.py
+++ b/tests/description-parsing.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 import os
 import sys
diff --git a/tests/import.TestCase b/tests/import.TestCase
index 1d00a688..cce85d68 100755
--- a/tests/import.TestCase
+++ b/tests/import.TestCase
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
 
diff --git a/tests/install.TestCase b/tests/install.TestCase
index 8cf8e088..d1ed93ff 100755
--- a/tests/install.TestCase
+++ b/tests/install.TestCase
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
 
diff --git a/tests/metadata.TestCase b/tests/metadata.TestCase
index c1ffbf36..33d18308 100755
--- a/tests/metadata.TestCase
+++ b/tests/metadata.TestCase
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163
 
diff --git a/tests/run-tests b/tests/run-tests
index de9c9a15..8ec03c35 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -83,7 +83,7 @@ fi
 
 # allow the location of python to be overridden
 if [ -z $python ]; then
-    python=python2
+    python=python3
 fi
 
 set -x # show each command as it is executed
diff --git a/tests/update.TestCase b/tests/update.TestCase
index d9d3ed0a..647c8d56 100755
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 
 # http://www.drdobbs.com/testing/unit-testing-with-python/240165163