diff --git a/.travis.yml b/.travis.yml
index 501a0b69ce..3ad310b37f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,8 +41,6 @@ install:
 - pip freeze --all
 - env
 
-# update egg_info based on setup.py in checkout
-- python bootstrap.py
 - "! grep pyc setuptools.egg-info/SOURCES.txt"
 
 script:
diff --git a/appveyor.yml b/appveyor.yml
index 0881806968..02fe1ee565 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -28,7 +28,6 @@ test_script:
   - python -m pip install --disable-pip-version-check --upgrade pip setuptools wheel
   - pip install --upgrade tox tox-venv virtualenv
   - pip freeze --all
-  - python bootstrap.py
   - tox -- --cov
 
 after_test:
diff --git a/docs/conf.py b/docs/conf.py
index cbd19fb470..6f6ae13a60 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 # hack to run the bootstrap script so that jaraco.packaging.sphinx
 # can invoke setup.py
 'READTHEDOCS' in os.environ and subprocess.check_call(
-    [sys.executable, 'bootstrap.py'],
+    [sys.executable, '-m', 'bootstrap'],
     cwd=os.path.join(os.path.dirname(__file__), os.path.pardir),
 )
 
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index d145fba140..0b4ae4d4c3 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -104,12 +104,8 @@ from the command line after pushing a new branch.
 Testing
 -------
 
-The primary tests are run using tox. To run the tests, first create the metadata
-needed to run the tests::
-
-    $ python bootstrap.py
-
-Then make sure you have tox installed, and invoke it::
+The primary tests are run using tox.  Make sure you have tox installed,
+and invoke it::
 
     $ tox
 
diff --git a/tools/tox_pip.py b/tools/tox_pip.py
index f592e41285..ba776638d6 100644
--- a/tools/tox_pip.py
+++ b/tools/tox_pip.py
@@ -13,9 +13,16 @@ def remove_setuptools():
     subprocess.check_call(cmd, cwd='.tox')
 
 
+def bootstrap():
+    print("Running bootstrap")
+    cmd = [sys.executable, '-m', 'bootstrap']
+    subprocess.check_call(cmd)
+
+
 def pip(args):
-    # When installing '.', remove setuptools
-    '.' in args and remove_setuptools()
+    if '.' in args:
+        remove_setuptools()
+        bootstrap()
 
     cmd = [sys.executable, '-m', 'pip'] + args
     subprocess.check_call(cmd)
diff --git a/tox.ini b/tox.ini
index a666f0afb7..ddfeddf96f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,3 @@
-# Note: Run "python bootstrap.py" before running Tox, to generate metadata.
-#
 # To run Tox against all supported Python interpreters, you can set:
 #
 # export TOXENV='py27,py3{5,6,7,8},pypy,pypy3'
@@ -47,7 +45,7 @@ commands=codecov -X gcov --file {toxworkdir}/coverage.xml
 deps = -r{toxinidir}/docs/requirements.txt
 skip_install=True
 commands =
-    python {toxinidir}/bootstrap.py
+    python -m bootstrap
     sphinx-build -W -b html -d {envtmpdir}/doctrees docs docs/build/html
     sphinx-build -W -b man -d {envtmpdir}/doctrees docs docs/build/man