diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
index 5a56c33b8066..03da451fd9a0 100644
--- a/src/librustdoc/html/markdown.rs
+++ b/src/librustdoc/html/markdown.rs
@@ -1135,23 +1135,27 @@ mod tests {
             })
         }
 
+        fn v() -> Vec<String> {
+            Vec::new()
+        }
+
         // marker                | should_panic| no_run| ignore| rust | test_harness| compile_fail
         //                       | allow_fail | error_codes
-        t("",                      false,        false,  false,  true,  false, false, false, Vec::new());
-        t("rust",                  false,        false,  false,  true,  false, false, false, Vec::new());
-        t("sh",                    false,        false,  false,  false, false, false, false, Vec::new());
-        t("ignore",                false,        false,  true,   true,  false, false, false, Vec::new());
-        t("should_panic",          true,         false,  false,  true,  false, false, false, Vec::new());
-        t("no_run",                false,        true,   false,  true,  false, false, false, Vec::new());
-        t("test_harness",          false,        false,  false,  true,  true,  false, false, Vec::new());
-        t("compile_fail",          false,        true,   false,  true,  false, true,  false, Vec::new());
-        t("allow_fail",            false,        false,  false,  true,  false, false, true, Vec::new());
-        t("{.no_run .example}",    false,        true,   false,  true,  false, false, false, Vec::new());
-        t("{.sh .should_panic}",   true,         false,  false,  false, false, false, false, Vec::new());
-        t("{.example .rust}",      false,        false,  false,  true,  false, false, false, Vec::new());
-        t("{.test_harness .rust}", false,        false,  false,  true,  true,  false, false, Vec::new());
-        t("text, no_run",          false,        true,   false,  false, false, false, false, Vec::new());
-        t("text,no_run",           false,        true,   false,  false, false, false, false, Vec::new());
+        t("",                      false,        false,  false,  true,  false, false, false, v());
+        t("rust",                  false,        false,  false,  true,  false, false, false, v());
+        t("sh",                    false,        false,  false,  false, false, false, false, v());
+        t("ignore",                false,        false,  true,   true,  false, false, false, v());
+        t("should_panic",          true,         false,  false,  true,  false, false, false, v());
+        t("no_run",                false,        true,   false,  true,  false, false, false, v());
+        t("test_harness",          false,        false,  false,  true,  true,  false, false, v());
+        t("compile_fail",          false,        true,   false,  true,  false, true,  false, v());
+        t("allow_fail",            false,        false,  false,  true,  false, false, true,  v());
+        t("{.no_run .example}",    false,        true,   false,  true,  false, false, false, v());
+        t("{.sh .should_panic}",   true,         false,  false,  false, false, false, false, v());
+        t("{.example .rust}",      false,        false,  false,  true,  false, false, false, v());
+        t("{.test_harness .rust}", false,        false,  false,  true,  true,  false, false, v());
+        t("text, no_run",          false,        true,   false,  false, false, false, false, v());
+        t("text,no_run",           false,        true,   false,  false, false, false, false, v());
     }
 
     #[test]
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index c68039f21ec2..7a09883a72ea 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -771,7 +771,8 @@ impl<T: Write> ConsoleTestState<T> {
     }
 
     pub fn write_run_finish(&mut self) -> io::Result<bool> {
-        assert!(self.passed + self.failed + self.ignored + self.measured + self.allowed_fail == self.total);
+        assert!(self.passed + self.failed + self.ignored + self.measured +
+                    self.allowed_fail == self.total);
 
         if self.options.display_output {
             self.write_outputs()?;
@@ -788,13 +789,14 @@ impl<T: Write> ConsoleTestState<T> {
         } else {
             self.write_pretty("FAILED", term::color::RED)?;
         }
-        let s = format!(". {} passed; {} failed; {} allowed to fail; {} ignored; {} measured; {} filtered out\n\n",
-                        self.passed,
-                        self.failed,
-                        self.allowed_fail,
-                        self.ignored,
-                        self.measured,
-                        self.filtered_out);
+        let s = format!(
+                ". {} passed; {} failed ({} allowed); {} ignored; {} measured; {} filtered out\n\n",
+                self.passed,
+                self.failed,
+                self.allowed_fail,
+                self.ignored,
+                self.measured,
+                self.filtered_out);
         self.write_plain(&s)?;
         return Ok(success);
     }