diff --git a/AdvancedInstall.md b/AdvancedInstall.md
index 67dcaf2..8c4b68d 100644
--- a/AdvancedInstall.md
+++ b/AdvancedInstall.md
@@ -14,15 +14,16 @@
6.5. Apple Disk Image (dmg)
7. Installing From A Source Tree
7.1. Creating a binary distribution From A Source Tree
-8. Platform-specific Notes
- 8.1. Debian/Ubuntu
- 8.2. CentOS 5.4
- 8.2.1 Dependencies
- 8.3. MacOS
- 8.4. Windows
- 8.4.1. What if that doesn't work?
- 8.4.2. How do I make it run as a Windows service?
- 8.4.3. How do I make it run under a different user account?
+8. Testing
+9. Platform-specific Notes
+ 9.1. Debian/Ubuntu
+ 9.2. CentOS 5.4
+ 9.2.1 Dependencies
+ 9.3. MacOS
+ 9.4. Windows
+ 9.4.1. What if that doesn't work?
+ 9.4.2. How do I make it run as a Windows service?
+ 9.4.3. How do I make it run under a different user account?
@@ -218,10 +219,35 @@ This should create a `dist` directory containing the bb-frozen distribution.
The [bbfreeze-users](https://groups.google.com/group/bbfreeze-users) Google
group may be able to help with general questions about bb-freeze.
-
+
+## Testing
+
+Use `python setup.py test` to run the whole test suite. This will rebuild
+if necessary.
+
+There are a few other supported ways to run tests:
+* `bin/tahoe debug trial`. This will *not* rebuild (if a build was needed,
+> some tests may fail). It accepts all of the same options as Twisted's `trial`
+> script; use `bin/tahoe debug trial --help` to see help for these.
+* `python setup.py trial` does the same thing as `bin/tahoe debug trial`,
+> although it doesn't support all of the `trial` options (and the test suite
+> must be specified using `-s`). It's supported mainly for backward
+> compatibility.
+* `make test` does the same thing as `python setup.py test`.
+* `make quicktest` does the same thing as `bin/tahoe debug trial`.
+
+Running `trial` directly is not supported because it will not necessarily
+put the correct libraries (the same ones that would be used by `bin/tahoe`)
+on Python's `sys.path`.
+
+To run a subset of the tests after making a source change that does not require
+a rebuild, `bin/tahoe debug trial ` is the quickest option.
+
+
+
## Platform-specific Notes
-
+
### !Debian/Ubuntu
Tahoe-LAFS is primarily developed on !Debian/Ubuntu machines. You can either build
@@ -229,26 +255,26 @@ from source (as described by this page), or download pre-compiled debian
packages for several distributions. See the [DownloadDebianPackages](DownloadDebianPackages) page for
details.
-
+
### CentOS 5.4
For installing in CentOS 5.4 you need this list of package:
yum install gcc python-devel sqlite-devel gcc-c++ openssl-devel
-
+
Dependencies
cpp glibc-devel glibc-headers kernel-headers libgomp libstdc++-devel e2fsprogs-devel keyutils-libs-devel krb5-devel libselinux-devel libsepol-devel zlib-devel
-
+
### MacOS
You will need the standard Xcode development tools installed, or at least GCC in order to build some dependencies.
Note that Xcode is quite large (2.5GB) so plan accordingly if you will need to download it.
-
+
### Windows
The following procedure will build and run Tahoe-LAFS on Windows. (This is basically exactly the [docs/quickstart.html](http://tahoe-lafs.org/source/tahoe-lafs/trunk/docs/quickstart.html) procedure except with Windows-specific paths spelled out.)
@@ -272,7 +298,7 @@ Note that this assumes that you install Python in the default location (C:\Pytho
`C:\Python26\python setup.py install` can also optionally be used as on other platforms.
-[=#point8.4.1]
+[=#point9.4.1]
==== What if that doesn't work? ====
If the build or install steps result in an error that says a compiler is needed, install the MinGW C/C++ compiler as follows:
@@ -292,12 +318,12 @@ compiler=mingw32
After installing the compilers, repeat the above instructions from step 4 (using a new command prompt to make sure that the environment variable setting has taken effect).
-
+
#### How do I make it run as a Windows service?
-
+
#### How do I make it run under a different user account?
1. Create the new user account if necessary.