diff --git a/app-build b/app-build
index 0374d6fc..680b6c51 100755
--- a/app-build
+++ b/app-build
@@ -17,4 +17,4 @@ set +u
 export DJANGO_SETTINGS_MODULE=omeroweb.settings
 export OMERODIR=/opt/omero/web/OMERO.web
 export ICE_CONFIG=${OMERO_DIST}/etc/ice.config
-python $DIR/setup.py test
+pytest -v
diff --git a/cli-build b/cli-build
index 32bf6772..97e25fbd 100755
--- a/cli-build
+++ b/cli-build
@@ -14,4 +14,5 @@ PLUGIN=${PLUGIN:-$GUESS}
 export OMERO_DIST=${OMERO_DIST:-/opt/omero/server/OMERO.server}
 omero $PLUGIN -h
 
-python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -vs
+export ICE_CONFIG=${OMERO_DIST}/etc/ice.config
+pytest -v
diff --git a/requirements.txt b/requirements.txt
index 908a54ea..685beb48 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,10 +4,9 @@ pep8-naming
 pre-commit
 pycodestyle
 restructuredtext_lint
-pytest<5
+pytest
 attrs
 restview
-mox
+pytest-mock
 # TODO: Apps only
 pytest-django
-pytest-runner
diff --git a/scripts-build b/scripts-build
index dbcbb578..edc70447 100755
--- a/scripts-build
+++ b/scripts-build
@@ -8,4 +8,5 @@ set -x
 
 cd $TARGET
 
-python setup.py test -t test -i ${OMERO_DIST}/etc/ice.config -v
+export ICE_CONFIG=${OMERO_DIST}/etc/ice.config
+pytest -v