diff --git a/README.rst b/README.rst
index 5b3b822..4eb6d99 100644
--- a/README.rst
+++ b/README.rst
@@ -7,7 +7,7 @@ Cookiecutter template for an OpenStack project. See https://github.com/audreyr/c
 * Free software: Apache license
 * pbr_: Set up to use Python Build Reasonableness
 * hacking_: Enforces the OpenStack Hacking Guidelines
-* testrepository_: Runs tests using testrepository
+* stestr_: Runs tests using stestr
 * OpenStack-Infra_: Ready for OpenStack Continuous Integration testing
 * Tox_ testing: Setup to easily test for Python 2.7, 3.5
 * Sphinx_ docs: Documentation ready for generation and publication
@@ -24,7 +24,7 @@ Generate a Python package project::
     cookiecutter https://git.openstack.org/openstack-dev/cookiecutter.git
 
 OpenStack projects require a working git repo for pbr to work, on newer
-versions of cookiecutter (>= 0.7.0 released 2013-11-09) this inital commit will
+versions of cookiecutter (>= 0.7.0 released 2013-11-09) this initial commit will
 be done automatically. Otherwise you will need to init a repo and commit to it
 before doing anything else::
 
@@ -40,7 +40,7 @@ Then:
 
 .. _pbr: http://docs.openstack.org/developer/pbr
 .. _OpenStack-Infra: http://docs.openstack.org/infra/system-config
-.. _testrepository: https://testrepository.readthedocs.org/
+.. _stestr: https://stestr.readthedocs.io/
 .. _Tox: http://testrun.org/tox/
 .. _Sphinx: http://sphinx-doc.org/
 .. _hacking: https://git.openstack.org/cgit/openstack-dev/hacking/plain/HACKING.rst