diff --git a/Makefile.am b/Makefile.am
index 6cfbaee018d..a34d923f591 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,8 @@ RC_RELEASE ?= $(shell date -u +0.1.%Y%m%d%H%M%S)
 MOCKCHROOT ?= fedora-$(DIST_NAME)-$(ARCH_NAME)
 MOCK_EXTRA_ARGS ?=
 
-COVERAGE ?= coverage3
+PYTHON ?= python3
+COVERAGE ?= $(PYTHON) -m coverage
 USER_SITE_BASE ?= $(abs_top_builddir)/python-site
 USER_SITE_PACKAGES ?= $(shell PYTHONUSERBASE=$(USER_SITE_BASE) $(PYTHON) -m site --user-site)
 
@@ -83,7 +84,7 @@ SKIP_BRANCHING_CHECK ?= "false"
 dist-hook:
 	for p in $(distdir)/po/*.po ; do \
 	    if [ -e "$$p" ]; then \
-		PYTHONPATH=$(srcdir)/translation-canary python3 -m translation_canary.translated \
+		PYTHONPATH=$(srcdir)/translation-canary $(PYTHON) -m translation_canary.translated \
 		    --release $(distdir)/po ; \
 	    fi ; \
 	    break ; \
diff --git a/scripts/testing/setup-mock-test-env.py b/scripts/testing/setup-mock-test-env.py
index 466989c7fe2..f27633e69ec 100755
--- a/scripts/testing/setup-mock-test-env.py
+++ b/scripts/testing/setup-mock-test-env.py
@@ -371,7 +371,7 @@ def install_pip_packages_to_mock(mock_command, packages):
 
     cmd = _run_cmd_in_chroot(cmd)
     cmd.append(
-        'python3 -m pip install --install-option="--install-scripts=/usr/bin" {}'.format(packages)
+        'python3 -m pip install {}'.format(packages)
     )
 
     _check_subprocess(cmd, "Can't install packages via pip to mock.")