diff --git a/share/spack/qa/run-doc-tests b/share/spack/qa/run-doc-tests
index 67701167aaaba85cea6df5e529754a463d76277d..dbf46c71aa05950164e53c5d249d1dd9d4779b2f 100755
--- a/share/spack/qa/run-doc-tests
+++ b/share/spack/qa/run-doc-tests
@@ -9,7 +9,7 @@
 #     run-doc-tests
 #
 # Notes:
-#     Requires sphinx, git, mercurial, and subversion.
+#     Requires sphinx, graphviz, git, mercurial, and subversion.
 #
 
 QA_DIR="$(dirname "$0")"
@@ -36,9 +36,7 @@ export PATH="$SPACK_ROOT/bin:$PATH"
 # Allows script to be run from anywhere
 cd "$DOC_DIR"
 
-# Cleanup temporary files upon exit or when script is killed
-trap 'make clean --silent' EXIT SIGINT SIGTERM
-
 # Treat warnings as fatal errors
+make clean --silent
 make SPHINXOPTS=-W