diff --git a/tests/run-make/windows-subsystem/Makefile b/tests/run-make/windows-subsystem/Makefile
deleted file mode 100644
index e3cf9181de4..00000000000
--- a/tests/run-make/windows-subsystem/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# ignore-cross-compile
-include ../tools.mk
-
-all:
-	$(RUSTC) windows.rs
-	$(RUSTC) console.rs
diff --git a/tests/run-make/windows-subsystem/console.rs b/tests/ui/windows-subsystem/console.rs
similarity index 78%
rename from tests/run-make/windows-subsystem/console.rs
rename to tests/ui/windows-subsystem/console.rs
index 61a92eb6a9d..8f0ca2de370 100644
--- a/tests/run-make/windows-subsystem/console.rs
+++ b/tests/ui/windows-subsystem/console.rs
@@ -1,3 +1,4 @@
+//@ run-pass
 #![windows_subsystem = "console"]
 
 fn main() {}
diff --git a/tests/ui/windows-subsystem-invalid.rs b/tests/ui/windows-subsystem/windows-subsystem-invalid.rs
similarity index 100%
rename from tests/ui/windows-subsystem-invalid.rs
rename to tests/ui/windows-subsystem/windows-subsystem-invalid.rs
diff --git a/tests/ui/windows-subsystem-invalid.stderr b/tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
similarity index 100%
rename from tests/ui/windows-subsystem-invalid.stderr
rename to tests/ui/windows-subsystem/windows-subsystem-invalid.stderr
diff --git a/tests/run-make/windows-subsystem/windows.rs b/tests/ui/windows-subsystem/windows.rs
similarity index 78%
rename from tests/run-make/windows-subsystem/windows.rs
rename to tests/ui/windows-subsystem/windows.rs
index 1138248f07d..65db0fec7a8 100644
--- a/tests/run-make/windows-subsystem/windows.rs
+++ b/tests/ui/windows-subsystem/windows.rs
@@ -1,3 +1,4 @@
+//@ run-pass
 #![windows_subsystem = "windows"]
 
 fn main() {}