diff --git a/tests/run-make/allow-non-lint-warnings-cmdline/rmake.rs b/tests/run-make/allow-non-lint-warnings-cmdline/rmake.rs
deleted file mode 100644
index 3866ed3f5be..00000000000
--- a/tests/run-make/allow-non-lint-warnings-cmdline/rmake.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test that -A warnings makes the 'empty trait list for derive' warning go away.
-
-use run_make_support::rustc;
-
-fn main() {
-    let output = rustc().input("foo.rs").arg("-Awarnings").run();
-    output.assert_stderr_not_contains("warning");
-}
diff --git a/tests/run-make/allow-non-lint-warnings-cmdline/foo.rs b/tests/ui/allow-non-lint-warnings.rs
similarity index 60%
rename from tests/run-make/allow-non-lint-warnings-cmdline/foo.rs
rename to tests/ui/allow-non-lint-warnings.rs
index 02e8ccabf79..f8f5a78ebff 100644
--- a/tests/run-make/allow-non-lint-warnings-cmdline/foo.rs
+++ b/tests/ui/allow-non-lint-warnings.rs
@@ -1,3 +1,6 @@
+//@ compile-flags: -Awarnings
+//@ check-pass
+
 #[derive()]
 #[derive(Copy, Clone)]
 pub struct Foo;