diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6aa11f62981..e66a7978c98 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-04-10  Jonathan Wakely  <jwakely@redhat.com>
+
+	* doc/xml/manual/test.xml: Improve documentation on running a subset
+	of tests.
+	* doc/html/manual/test.html: Regenerate.
+
 2015-04-10  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
 	* config/abi/post/powerpc-linux-gnu/baseline_symbols.txt: Update
diff --git a/libstdc++-v3/doc/html/manual/test.html b/libstdc++-v3/doc/html/manual/test.html
index 78ffb226994..893cf7242e3 100644
--- a/libstdc++-v3/doc/html/manual/test.html
+++ b/libstdc++-v3/doc/html/manual/test.html
@@ -166,12 +166,20 @@ make check-target-libstdc++-v3 RUNTESTFLAGS="-v"
     </p><pre class="programlisting">
 make check-target-libstdc++-v3 RUNTESTFLAGS="-v -v"
 </pre><p>
-      To run a subset of the library tests, you will need to generate
-      the <span class="emphasis"><em>testsuite_files</em></span> file by running
+      To run a subset of the library tests, you can either generate the
+      <span class="emphasis"><em>testsuite_files</em></span> file (described below) by running
       <span class="command"><strong>make testsuite_files</strong></span> in the
-      <span class="emphasis"><em>libbuilddir/testsuite</em></span> directory, described
-      below.  Edit the file to remove the tests you don't want and
-      then run the testsuite as normal.
+      <span class="emphasis"><em>libbuilddir/testsuite</em></span> directory, then edit the
+      file to remove the tests you don't want and then run the testsuite as
+      normal, or you can specify a testsuite and a subset of tests in the
+      RUNTESTFLAGS variable.
+    </p><p>
+      For example, to run only the tests for containers you could use:
+    </p><pre class="programlisting">
+make check-target-libstdc++-v3 RUNTESTFLAGS="conformance.exp=23_containers/*"
+</pre><p>
+      When combining this with other options in RUNTESTFLAGS the
+      <span class="emphasis"><em>testsuite.exp=testfiles</em></span> options must come first.
     </p><p>
       There are two ways to run on a simulator: set up DEJAGNU to point to a
       specially crafted site.exp, or pass down --target_board flags.
diff --git a/libstdc++-v3/doc/xml/manual/test.xml b/libstdc++-v3/doc/xml/manual/test.xml
index d3d22647193..456c48b2639 100644
--- a/libstdc++-v3/doc/xml/manual/test.xml
+++ b/libstdc++-v3/doc/xml/manual/test.xml
@@ -279,12 +279,26 @@ make check-target-libstdc++-v3 RUNTESTFLAGS="-v -v"
 </programlisting>
 
     <para>
-      To run a subset of the library tests, you will need to generate
-      the <emphasis>testsuite_files</emphasis> file by running
+      To run a subset of the library tests, you can either generate the
+      <emphasis>testsuite_files</emphasis> file (described below) by running
       <command>make testsuite_files</command> in the
-      <emphasis>libbuilddir/testsuite</emphasis> directory, described
-      below.  Edit the file to remove the tests you don't want and
-      then run the testsuite as normal.
+      <emphasis>libbuilddir/testsuite</emphasis> directory, then edit the
+      file to remove the tests you don't want and then run the testsuite as
+      normal, or you can specify a testsuite and a subset of tests in the
+      RUNTESTFLAGS variable.
+    </para>
+
+    <para>
+      For example, to run only the tests for containers you could use:
+    </para>
+
+<programlisting>
+make check-target-libstdc++-v3 RUNTESTFLAGS="conformance.exp=23_containers/*"
+</programlisting>
+
+    <para>
+      When combining this with other options in RUNTESTFLAGS the
+      <emphasis>testsuite.exp=testfiles</emphasis> options must come first.
     </para>
 
     <para>