diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index f9d0df9981a1d..6022865c202fd 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -359,8 +359,14 @@ pub fn maketest(s: &str, cratename: Option<&str>, dont_insert_main: bool,
     if dont_insert_main || s.contains("fn main") {
         prog.push_str(&everything_else);
     } else {
-        prog.push_str("fn main() {\n    ");
-        prog.push_str(&everything_else);
+        prog.push_str("fn main() {\n");
+        for line in everything_else.split("\n") {
+            if line.len() > 0 {
+                prog.push_str(&format!("    {}\n", line));
+            } else {
+                prog.push_str("\n");
+            }
+        }
         prog = prog.trim().into();
         prog.push_str("\n}");
     }
diff --git a/src/test/rustdoc/issue-25944.rs b/src/test/rustdoc/issue-25944.rs
index c22ecb4a22b3d..b04aa62f07093 100644
--- a/src/test/rustdoc/issue-25944.rs
+++ b/src/test/rustdoc/issue-25944.rs
@@ -13,8 +13,9 @@
 /// ```
 /// let a = r#"
 /// foo
+///
 /// bar"#;
-/// let b = "\nfoo\nbar";
+/// let b = "\n    foo\n\n    bar";
 /// assert_eq!(a, b);
 /// ```
 pub fn main() {