diff --git a/Documentation/intro/install/general.rst b/Documentation/intro/install/general.rst
index f2cd2b13b..1ea82b6ae 100644
--- a/Documentation/intro/install/general.rst
+++ b/Documentation/intro/install/general.rst
@@ -365,7 +365,8 @@ Building
      see unusual warnings when you use both together, consider disabling
      ccache.
 
-2. Consider running the testsuite. Refer to **Testing** for instructions.
+2. Consider running the testsuite. Refer to :doc:`/topics/testing` for
+   instructions.
 
 3. Run ``make install`` to install the executables and manpages into the
    running system, by default under ``/usr/local``::
@@ -499,7 +500,7 @@ upgrade the database schema:
           $ ovsdb-tool convert /usr/local/etc/openvswitch/conf.db \
               vswitchd/vswitch.ovsschema
 
-4. Start the Open vSwitch daemons as described under **Starting** above.
+4. Start the Open vSwitch daemons as described under `Starting`_ above.
 
 Hot Upgrading
 -------------
diff --git a/Documentation/topics/testing.rst b/Documentation/topics/testing.rst
index f48665b10..f67b148ef 100644
--- a/Documentation/topics/testing.rst
+++ b/Documentation/topics/testing.rst
@@ -237,8 +237,9 @@ Vagrant
   Requires Vagrant (version 1.7.0 or later) and a compatible hypervisor
 
 .. note::
-  You must **Bootstrap** and **Configure** the sources before you run the steps
-  described here.
+  You must bootstrap and configure the sources (see
+  doc:`/intro/install/general`) before you run the steps described
+  here.
 
 A Vagrantfile is provided allowing to compile and provision the source tree as
 found locally in a virtual machine using the following command::