diff --git a/src/test/rustdoc-ui/coverage/json.rs b/src/test/rustdoc-ui/coverage/json.rs
new file mode 100644
index 000000000000..8b80244f825c
--- /dev/null
+++ b/src/test/rustdoc-ui/coverage/json.rs
@@ -0,0 +1,27 @@
+// build-pass
+// compile-flags:-Z unstable-options --show-coverage
+
+pub mod foo {
+    /// Hello!
+    pub struct Foo;
+    /// Bar
+    pub enum Bar { A }
+}
+
+/// X
+pub struct X;
+
+/// Bar
+pub mod bar {
+    /// bar
+    pub struct Bar;
+    /// X
+    pub enum X { Y }
+}
+
+/// yolo
+pub enum Yolo { X }
+
+pub struct Xo<T: Clone> {
+    x: T,
+}
diff --git a/src/test/rustdoc-ui/coverage/json.stdout b/src/test/rustdoc-ui/coverage/json.stdout
new file mode 100644
index 000000000000..be56a8c0ffaf
--- /dev/null
+++ b/src/test/rustdoc-ui/coverage/json.stdout
@@ -0,0 +1,7 @@
++-------------------------------------+------------+------------+------------+
+| File                                | Documented |      Total | Percentage |
++-------------------------------------+------------+------------+------------+
+| ...test/rustdoc-ui/coverage/json.rs |          7 |         13 |      53.8% |
++-------------------------------------+------------+------------+------------+
+| Total                               |          7 |         13 |      53.8% |
++-------------------------------------+------------+------------+------------+
diff --git a/src/test/rustdoc/output-format-fail-check.rs b/src/test/rustdoc/output-format-fail-check.rs
new file mode 100644
index 000000000000..a78811078be2
--- /dev/null
+++ b/src/test/rustdoc/output-format-fail-check.rs
@@ -0,0 +1,5 @@
+// compile-flags:-Z unstable-options --output-format
+// should-fail
+
+/// toudoum!
+pub struct SomeStruct;