diff --git a/.azure-pipelines/templates/steps/sphinx-steps.yml b/.azure-pipelines/templates/steps/sphinx-steps.yml
index 7e1d2ee9d..fa2952b05 100644
--- a/.azure-pipelines/templates/steps/sphinx-steps.yml
+++ b/.azure-pipelines/templates/steps/sphinx-steps.yml
@@ -2,14 +2,12 @@ steps:
   - bash: |
       FINAL_STATUS=0
       declare -a FAILED_BUILDS
-      python3 -m venv .venv
-      source .venv/bin/activate
-      python tools/pipstrap.py
+      tools/venv.py
+      source venv/bin/activate
       for doc_path in */docs
       do
         echo ""
         echo "##[group]Building $doc_path"
-        tools/pip_install_editable.py $doc_path/..[docs]
         if ! sphinx-build -W --keep-going -b html $doc_path $doc_path/_build/html; then
           FINAL_STATUS=1
           FAILED_BUILDS[${#FAILED_BUILDS[@]}]="${doc_path%/docs}"
diff --git a/tox.ini b/tox.ini
index a45766d87..2d2cf63f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -100,7 +100,8 @@ setenv =
 basepython =
     {[testenv:oldest]basepython}
 commands =
-    {[base]install_and_test} certbot-apache
+    {[base]pip_install} acme[dev] certbot[dev] certbot-apache
+    python -m pytest certbot-apache
 setenv =
     {[testenv:oldest]setenv}
 
@@ -108,7 +109,8 @@ setenv =
 basepython =
     {[testenv:oldest]basepython}
 commands =
-    {[base]install_and_test} certbot-apache[dev]
+    {[base]pip_install} acme[dev] certbot[dev] certbot-apache[dev]
+    python -m pytest certbot-apache
 setenv =
     {[testenv:oldest]setenv}
 
@@ -116,7 +118,8 @@ setenv =
 basepython =
     {[testenv:oldest]basepython}
 commands =
-    {[base]install_and_test} certbot[dev]
+    {[base]pip_install} acme[dev] certbot[dev]
+    python -m pytest certbot
 setenv =
     {[testenv:oldest]setenv}
 
@@ -124,7 +127,8 @@ setenv =
 basepython =
     {[testenv:oldest]basepython}
 commands =
-    {[base]install_and_test} {[base]dns_packages}
+    {[base]pip_install} acme[dev] certbot[dev] {[base]dns_packages}
+    python -m pytest {[base]dns_packages}
 setenv =
     {[testenv:oldest]setenv}
 
@@ -132,7 +136,8 @@ setenv =
 basepython =
     {[testenv:oldest]basepython}
 commands =
-    {[base]install_and_test} certbot-nginx
+    {[base]pip_install} acme[dev] certbot[dev] certbot-nginx
+    python -m pytest certbot-nginx
     python tests/lock_test.py
 setenv =
     {[testenv:oldest]setenv}