diff --git a/tests/ui/instrument-coverage/except-unused-functions.rs b/tests/ui/instrument-coverage/except-unused-functions.rs
deleted file mode 100644
index 5a0b7d4fef9..00000000000
--- a/tests/ui/instrument-coverage/except-unused-functions.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// compile-flags: -Cinstrument-coverage=except-unused-functions
-
-fn main() {}
diff --git a/tests/ui/instrument-coverage/except-unused-generics.rs b/tests/ui/instrument-coverage/except-unused-generics.rs
deleted file mode 100644
index 4b1ddf29026..00000000000
--- a/tests/ui/instrument-coverage/except-unused-generics.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-// compile-flags: -Cinstrument-coverage=except-unused-generics
-
-fn main() {}
diff --git a/tests/ui/instrument-coverage/except-unused-functions.stderr b/tests/ui/instrument-coverage/unstable.branch.stderr
similarity index 100%
rename from tests/ui/instrument-coverage/except-unused-functions.stderr
rename to tests/ui/instrument-coverage/unstable.branch.stderr
diff --git a/tests/ui/instrument-coverage/except-unused-generics.stderr b/tests/ui/instrument-coverage/unstable.except-unused-functions.stderr
similarity index 100%
rename from tests/ui/instrument-coverage/except-unused-generics.stderr
rename to tests/ui/instrument-coverage/unstable.except-unused-functions.stderr
diff --git a/tests/ui/instrument-coverage/unstable.except-unused-generics.stderr b/tests/ui/instrument-coverage/unstable.except-unused-generics.stderr
new file mode 100644
index 00000000000..acc633a2a6d
--- /dev/null
+++ b/tests/ui/instrument-coverage/unstable.except-unused-generics.stderr
@@ -0,0 +1,2 @@
+error: `-C instrument-coverage=branch` and `-C instrument-coverage=except-*` require `-Z unstable-options`
+
diff --git a/tests/ui/instrument-coverage/unstable.rs b/tests/ui/instrument-coverage/unstable.rs
new file mode 100644
index 00000000000..c16bcd0bf6d
--- /dev/null
+++ b/tests/ui/instrument-coverage/unstable.rs
@@ -0,0 +1,6 @@
+// revisions: branch except-unused-functions except-unused-generics
+// [branch] compile-flags: -Cinstrument-coverage=branch
+// [except-unused-functions] compile-flags: -Cinstrument-coverage=except-unused-functions
+// [except-unused-generics] compile-flags: -Cinstrument-coverage=except-unused-generics
+
+fn main() {}