diff --git a/src/libcore/fmt/builders.rs b/src/libcore/fmt/builders.rs
index 32d6aa19c6456..c122d8b2723e8 100644
--- a/src/libcore/fmt/builders.rs
+++ b/src/libcore/fmt/builders.rs
@@ -145,12 +145,7 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
                 ("(", "")
             };
 
-            if self.is_pretty() {
-                let mut writer = PadAdapter::new(self.fmt);
-                fmt::write(&mut writer, format_args!("{}\n{:#?}", prefix, value))
-            } else {
-                write!(self.fmt, "{}{}{:?}", prefix, space, value)
-            }
+            write!(self.fmt, "{}{}{:?}", prefix, space, value)
         });
 
         self.has_fields = true;
@@ -162,19 +157,11 @@ impl<'a, 'b: 'a> DebugTuple<'a, 'b> {
     pub fn finish(&mut self) -> fmt::Result {
         if self.has_fields {
             self.result = self.result.and_then(|_| {
-                if self.is_pretty() {
-                    self.fmt.write_str("\n)")
-                } else {
-                    self.fmt.write_str(")")
-                }
+                self.fmt.write_str(")")
             });
         }
         self.result
     }
-
-    fn is_pretty(&self) -> bool {
-        self.fmt.flags() & (1 << (FlagV1::Alternate as usize)) != 0
-    }
 }
 
 struct DebugInner<'a, 'b: 'a> {
diff --git a/src/libcoretest/fmt/builders.rs b/src/libcoretest/fmt/builders.rs
index 885ee3f9c3be2..ed3df06bfe826 100644
--- a/src/libcoretest/fmt/builders.rs
+++ b/src/libcoretest/fmt/builders.rs
@@ -120,6 +120,9 @@ mod debug_tuple {
 
         assert_eq!("Foo", format!("{:?}", Foo));
         assert_eq!("Foo", format!("{:#?}", Foo));
+
+        assert_eq!("None", format!("{:?}", None::<Foo>));
+        assert_eq!("None", format!("{:#?}", None::<Foo>));
     }
 
     #[test]
@@ -135,11 +138,13 @@ mod debug_tuple {
         }
 
         assert_eq!("Foo(true)", format!("{:?}", Foo));
-        assert_eq!(
-"Foo(
-    true
-)",
-                   format!("{:#?}", Foo));
+        assert_eq!("Foo(true)", format!("{:#?}", Foo));
+
+        assert_eq!("Some(1)", format!("{:?}", Some(1)));
+        assert_eq!("Some(1)", format!("{:#?}", Some(1)));
+
+        assert_eq!("(true,)", format!("{:?}", (true,)));
+        assert_eq!("(true,)", format!("{:#?}", (true,)));
     }
 
     #[test]
@@ -156,12 +161,10 @@ mod debug_tuple {
         }
 
         assert_eq!("Foo(true, 10/20)", format!("{:?}", Foo));
-        assert_eq!(
-"Foo(
-    true,
-    10/20
-)",
-                   format!("{:#?}", Foo));
+        assert_eq!("Foo(true, 10/20)", format!("{:#?}", Foo));
+
+        assert_eq!("(true, 123)", format!("{:?}", (true, 123)));
+        assert_eq!("(true, 123)", format!("{:#?}", (true, 123)));
     }
 
     #[test]
@@ -190,15 +193,16 @@ mod debug_tuple {
 
         assert_eq!("Bar(Foo(true, 10/20), \"world\")",
                    format!("{:?}", Bar));
-        assert_eq!(
-"Bar(
-    Foo(
-        true,
-        10/20
-    ),
-    \"world\"
-)",
+        assert_eq!("Bar(Foo(true, 10/20), \"world\")",
                    format!("{:#?}", Bar));
+
+        #[derive(Debug)]
+        struct Baz {
+            value: i32
+        }
+
+        assert_eq!("(true, Baz { value: 1 })", format!("{:?}", (true, Baz { value: 1 })));
+        assert_eq!("(true, Baz { value: 1 })", format!("{:#?}", (true, Baz { value: 1 })));
     }
 }