diff --git a/tests/ui/linking/link-self-contained-malformed.invalid_modifier.stderr b/tests/ui/linking/link-self-contained-malformed.invalid_modifier.stderr
new file mode 100644
index 0000000000000..28e2c74fda229
--- /dev/null
+++ b/tests/ui/linking/link-self-contained-malformed.invalid_modifier.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `*lld` for codegen option `link-self-contained` - one of: `y`, `yes`, `on`, `n`, `no`, `off`, or a list of enabled (`+` prefix) and disabled (`-` prefix) components: `crto`, `libc`, `unwind`, `linker`, `sanitizers`, `mingw` was expected
+
diff --git a/tests/ui/linking/link-self-contained-malformed.no_value.stderr b/tests/ui/linking/link-self-contained-malformed.no_value.stderr
new file mode 100644
index 0000000000000..dd8e8af074bfc
--- /dev/null
+++ b/tests/ui/linking/link-self-contained-malformed.no_value.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `` for codegen option `link-self-contained` - one of: `y`, `yes`, `on`, `n`, `no`, `off`, or a list of enabled (`+` prefix) and disabled (`-` prefix) components: `crto`, `libc`, `unwind`, `linker`, `sanitizers`, `mingw` was expected
+
diff --git a/tests/ui/linking/link-self-contained-malformed.rs b/tests/ui/linking/link-self-contained-malformed.rs
new file mode 100644
index 0000000000000..8ccb82eee2707
--- /dev/null
+++ b/tests/ui/linking/link-self-contained-malformed.rs
@@ -0,0 +1,23 @@
+//! Check that malformed `-Clink-self-contained` invocations are properly rejected.
+
+//@ revisions: no_value
+//@[no_value] compile-flags: -Clink-self-contained=
+//[no_value]~? ERROR incorrect value `` for codegen option `link-self-contained`
+
+//@ revisions: invalid_modifier
+//@[invalid_modifier] compile-flags: -Clink-self-contained=*lld
+//[invalid_modifier]~? ERROR incorrect value `*lld` for codegen option `link-self-contained`
+
+//@ revisions: unknown_value
+//@[unknown_value] compile-flags: -Clink-self-contained=unknown
+//[unknown_value]~? ERROR incorrect value `unknown` for codegen option `link-self-contained`
+
+//@ revisions: unknown_modifier_value
+//@[unknown_modifier_value] compile-flags: -Clink-self-contained=-unknown
+//[unknown_modifier_value]~? ERROR incorrect value `-unknown` for codegen option `link-self-contained`
+
+//@ revisions: unknown_boolean
+//@[unknown_boolean] compile-flags: -Clink-self-contained=maybe
+//[unknown_boolean]~? ERROR incorrect value `maybe` for codegen option `link-self-contained`
+
+fn main() {}
diff --git a/tests/ui/linking/link-self-contained-malformed.unknown_boolean.stderr b/tests/ui/linking/link-self-contained-malformed.unknown_boolean.stderr
new file mode 100644
index 0000000000000..7924074d1bf47
--- /dev/null
+++ b/tests/ui/linking/link-self-contained-malformed.unknown_boolean.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `maybe` for codegen option `link-self-contained` - one of: `y`, `yes`, `on`, `n`, `no`, `off`, or a list of enabled (`+` prefix) and disabled (`-` prefix) components: `crto`, `libc`, `unwind`, `linker`, `sanitizers`, `mingw` was expected
+
diff --git a/tests/ui/linking/link-self-contained-malformed.unknown_modifier_value.stderr b/tests/ui/linking/link-self-contained-malformed.unknown_modifier_value.stderr
new file mode 100644
index 0000000000000..2dc58c0f7e8f9
--- /dev/null
+++ b/tests/ui/linking/link-self-contained-malformed.unknown_modifier_value.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `-unknown` for codegen option `link-self-contained` - one of: `y`, `yes`, `on`, `n`, `no`, `off`, or a list of enabled (`+` prefix) and disabled (`-` prefix) components: `crto`, `libc`, `unwind`, `linker`, `sanitizers`, `mingw` was expected
+
diff --git a/tests/ui/linking/link-self-contained-malformed.unknown_value.stderr b/tests/ui/linking/link-self-contained-malformed.unknown_value.stderr
new file mode 100644
index 0000000000000..ce4c44299cd2e
--- /dev/null
+++ b/tests/ui/linking/link-self-contained-malformed.unknown_value.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `unknown` for codegen option `link-self-contained` - one of: `y`, `yes`, `on`, `n`, `no`, `off`, or a list of enabled (`+` prefix) and disabled (`-` prefix) components: `crto`, `libc`, `unwind`, `linker`, `sanitizers`, `mingw` was expected
+
diff --git a/tests/ui/linking/linker-features-malformed.invalid_modifier.stderr b/tests/ui/linking/linker-features-malformed.invalid_modifier.stderr
new file mode 100644
index 0000000000000..909b277089f42
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.invalid_modifier.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `*lld` for unstable option `linker-features` - a list of enabled (`+` prefix) and disabled (`-` prefix) features: `lld` was expected
+
diff --git a/tests/ui/linking/linker-features-malformed.invalid_separator.stderr b/tests/ui/linking/linker-features-malformed.invalid_separator.stderr
new file mode 100644
index 0000000000000..0f84898a77422
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.invalid_separator.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `-lld@+lld` for unstable option `linker-features` - a list of enabled (`+` prefix) and disabled (`-` prefix) features: `lld` was expected
+
diff --git a/tests/ui/linking/linker-features-malformed.no_value.stderr b/tests/ui/linking/linker-features-malformed.no_value.stderr
new file mode 100644
index 0000000000000..e93a4e79bb1d8
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.no_value.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `` for unstable option `linker-features` - a list of enabled (`+` prefix) and disabled (`-` prefix) features: `lld` was expected
+
diff --git a/tests/ui/linking/linker-features-malformed.rs b/tests/ui/linking/linker-features-malformed.rs
new file mode 100644
index 0000000000000..0bdcfa39920f0
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.rs
@@ -0,0 +1,27 @@
+//! Check that malformed `-Zlinker-features` flags are properly rejected.
+
+//@ revisions: no_value
+//@[no_value] compile-flags: -Zlinker-features=
+//[no_value]~? ERROR incorrect value `` for unstable option `linker-features`
+
+//@ revisions: invalid_modifier
+//@[invalid_modifier] compile-flags: -Zlinker-features=*lld
+//[invalid_modifier]~? ERROR incorrect value `*lld` for unstable option `linker-features`
+
+//@ revisions: unknown_value
+//@[unknown_value] compile-flags: -Zlinker-features=unknown
+//[unknown_value]~? ERROR incorrect value `unknown` for unstable option `linker-features`
+
+//@ revisions: unknown_modifier_value
+//@[unknown_modifier_value] compile-flags: -Zlinker-features=-unknown
+//[unknown_modifier_value]~? ERROR incorrect value `-unknown` for unstable option `linker-features`
+
+//@ revisions: unknown_boolean
+//@[unknown_boolean] compile-flags: -Zlinker-features=maybe
+//[unknown_boolean]~? ERROR incorrect value `maybe` for unstable option `linker-features`
+
+//@ revisions: invalid_separator
+//@[invalid_separator] compile-flags: -Zlinker-features=-lld@+lld
+//[invalid_separator]~? ERROR incorrect value `-lld@+lld` for unstable option `linker-features`
+
+fn main() {}
diff --git a/tests/ui/linking/linker-features-malformed.unknown_boolean.stderr b/tests/ui/linking/linker-features-malformed.unknown_boolean.stderr
new file mode 100644
index 0000000000000..865738d0ccc1a
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.unknown_boolean.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `maybe` for unstable option `linker-features` - a list of enabled (`+` prefix) and disabled (`-` prefix) features: `lld` was expected
+
diff --git a/tests/ui/linking/linker-features-malformed.unknown_modifier_value.stderr b/tests/ui/linking/linker-features-malformed.unknown_modifier_value.stderr
new file mode 100644
index 0000000000000..03b9620ca2633
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.unknown_modifier_value.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `-unknown` for unstable option `linker-features` - a list of enabled (`+` prefix) and disabled (`-` prefix) features: `lld` was expected
+
diff --git a/tests/ui/linking/linker-features-malformed.unknown_value.stderr b/tests/ui/linking/linker-features-malformed.unknown_value.stderr
new file mode 100644
index 0000000000000..566632a3df381
--- /dev/null
+++ b/tests/ui/linking/linker-features-malformed.unknown_value.stderr
@@ -0,0 +1,2 @@
+error: incorrect value `unknown` for unstable option `linker-features` - a list of enabled (`+` prefix) and disabled (`-` prefix) features: `lld` was expected
+