diff --git a/.ci/write-dockerfile.sh b/.ci/write-dockerfile.sh
index 7a3512dafd9..0453a023a74 100755
--- a/.ci/write-dockerfile.sh
+++ b/.ci/write-dockerfile.sh
@@ -275,7 +275,7 @@ cat <<EOF
 FROM with-system-packages AS bootstrapped
 #:bootstrapping:
 RUN rm -rf /new /sage/.git
-$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
+$ADD Makefile VERSION.txt COPYING.txt condarc.yml README.md bootstrap conftest.py configure_wrapper configure.ac sage .homebrew-build-env tox.ini .gitignore /new/
 $ADD config/config.rpath /new/config/config.rpath
 $ADD src/doc/bootstrap /new/src/doc/bootstrap
 $ADD src/bin /new/src/bin
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bbecdf481b6..05eaa3a768e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -308,6 +308,8 @@ jobs:
 
       - name: Generate Dockerfile
         # From docker.yml
+        # tox -e <environment name> command runs commands in `tox.ini`,
+        # in particular the script `.ci/write-dockerfile.sh`, to generate `Dockerfile`.
         run: |
           tox -e ${{ env.TOX_ENV }}
           cp .tox/${{ env.TOX_ENV }}/Dockerfile .
diff --git a/.gitignore b/.gitignore
index b8bfc364a26..36a502b10a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@
 /config.log
 /config.status
 /configure
+/real_configure
 /confdefs.h
 
 /m4/sage_spkg_configures.m4
diff --git a/bootstrap b/bootstrap
index 00c2a1f7d54..77a5cde41ed 100755
--- a/bootstrap
+++ b/bootstrap
@@ -146,7 +146,9 @@ EOF
 
     st=$?
     case $st in
-        0) true;; # Success
+        0)  # Success
+            mv configure real_configure
+            cp configure_wrapper configure;;
 
         179|16|63|127)  # no m4 for pkg-config|autotools not installed|or version too old
             if [ $DOWNLOAD = yes ]; then
@@ -220,7 +222,7 @@ save () {
     fi
     mkdir -p upstream
     tar zcf "$NEWCONFBALL" \
-	configure \
+	configure real_configure configure_wrapper \
 	config/install-sh config/compile config/config.guess config/config.sub config/missing \
 	build/make/Makefile-auto.in \
 	src/doc/en/installation/*.txt \
diff --git a/configure_wrapper b/configure_wrapper
new file mode 100755
index 00000000000..3eb3eeb00b4
--- /dev/null
+++ b/configure_wrapper
@@ -0,0 +1,4 @@
+#! /bin/sh
+cp conftest.py bak_conftest.py
+./real_configure $@
+mv bak_conftest.py conftest.py
diff --git a/src/doc/en/developer/tools.rst b/src/doc/en/developer/tools.rst
index bc18723cb24..661b8972185 100644
--- a/src/doc/en/developer/tools.rst
+++ b/src/doc/en/developer/tools.rst
@@ -382,7 +382,7 @@ package :mod:`sage.numerical.backends` and some modules in
 
 - VS Code: Install the `Python extension <https://marketplace.visualstudio.com/items?itemName=ms-python.python>`_ and follow the `official VS Code documentation <https://code.visualstudio.com/docs/python/testing>`__.
 
-*Configuration:* :sage_root:`src/conftest.py`
+*Configuration:* :sage_root:`conftest.py`
 
 *Documentation:* https://docs.pytest.org/en/stable/index.html