diff --git a/src/building/how-to-build-and-run.md b/src/building/how-to-build-and-run.md
index 981bb6e5..ae3aabf1 100644
--- a/src/building/how-to-build-and-run.md
+++ b/src/building/how-to-build-and-run.md
@@ -212,6 +212,11 @@ host: x86_64-unknown-linux-gnu
 release: 1.48.0-dev
 LLVM version: 11.0
 ```
+
+The rustup toolchain points to the specified toolchain compiled in your `build` directory,
+so the rustup toolchain will be updated whenever `x.py build` or `x.py test` are run for
+that toolchain/stage.
+
 ## Other `x.py` commands
 
 Here are a few other useful `x.py` commands. We'll cover some of them in detail
diff --git a/src/tests/running.md b/src/tests/running.md
index 2e1ce0a9..c91a27bf 100644
--- a/src/tests/running.md
+++ b/src/tests/running.md
@@ -200,8 +200,10 @@ however compare-modes must be manually run individually via the `--compare-mode`
 
 ## Running tests manually
 
-Sometimes it's easier and faster to just run the test by hand. Most tests are
-just `rs` files, so you can do something like
+Sometimes it's easier and faster to just run the test by hand.
+Most tests are just `rs` files, so after
+[creating a rustup toolchain](/building/how-to-build-and-run.html#creating-a-rustup-toolchain),
+you can do something like:
 
 ```bash
 rustc +stage1 src/test/ui/issue-1234.rs