diff --git a/bin/tests/system/.gitignore b/bin/tests/system/.gitignore
index d41de04dd4..cff1aa39fd 100644
--- a/bin/tests/system/.gitignore
+++ b/bin/tests/system/.gitignore
@@ -8,7 +8,6 @@ named.lock
 named.pid
 named.run
 /feature-test
-/test.output.*
 /makejournal
 /random.data
 /*.log
diff --git a/bin/tests/system/README b/bin/tests/system/README
index b4d64dd7ff..ffc3a900cb 100644
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -641,10 +641,6 @@ stored in the test directory.
 2. Files produced by named which may not be cleaned up if named exits
 abnormally, e.g. core files, PID files etc., are stored in the test directory.
 
-3. A file "test.output.<test-name>" containing the text written to stdout by the
-test is written to bin/tests/system/.  This file is only produced when the test
-is run as part of the entire test suite (e.g. via make).
-
 If the test fails, all these files are retained.  But if the test succeeds,
 they are cleaned up at different times:
 
@@ -653,7 +649,3 @@ they are cleaned up at different times:
 
 2. Files that may not be cleaned up if named exits abnormally can be removed
 using the "cleanall.sh" script.
-
-3. "test.output.*" files are deleted when the test suite ends.  At this point,
-the file "testsummary.sh" is called which concatenates all the "test.output.*"
-files into a single "systests.output" file before deleting them.
diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 79a8434b3e..5fafffd203 100644
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -31,6 +31,5 @@ rm -f ../random.data
 for d in $SUBDIRS
 do
    test ! -f $d/clean.sh || ( cd $d && $SHELL clean.sh )
-   rm -f test.output.$d
    test -d $d && find $d -type d -exec rmdir '{}' \; 2> /dev/null
 done