diff --git a/src/test/run-make/msvc-data-only/foo.rs b/src/test/auxiliary/msvc-data-only-lib.rs
similarity index 95%
rename from src/test/run-make/msvc-data-only/foo.rs
rename to src/test/auxiliary/msvc-data-only-lib.rs
index 38bff8be125b6..71fb9a519489b 100644
--- a/src/test/run-make/msvc-data-only/foo.rs
+++ b/src/test/auxiliary/msvc-data-only-lib.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// no-prefer-dynamic
+
 #![crate_type = "rlib"]
 
 pub static FOO: i32 = 42;
diff --git a/src/test/run-make/msvc-data-only/Makefile b/src/test/run-make/msvc-data-only/Makefile
deleted file mode 100644
index 251a3a9768d78..0000000000000
--- a/src/test/run-make/msvc-data-only/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Test that on *-pc-windows-msvc we can link to a rlib containing only data.
-# See #26591, #27438
-
--include ../tools.mk
-
-all:
-	$(RUSTC) foo.rs
-	$(RUSTC) bar.rs
diff --git a/src/test/run-make/msvc-data-only/bar.rs b/src/test/run-pass/msvc-data-only.rs
similarity index 78%
rename from src/test/run-make/msvc-data-only/bar.rs
rename to src/test/run-pass/msvc-data-only.rs
index 0e3af9ff3fd48..ad6888c4d3096 100644
--- a/src/test/run-make/msvc-data-only/bar.rs
+++ b/src/test/run-pass/msvc-data-only.rs
@@ -8,8 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate foo;
+// aux-build:msvc-data-only-lib.rs
+
+extern crate msvc_data_only_lib;
 
 fn main() {
-    println!("The answer is {} !", foo::FOO);
+    println!("The answer is {} !", msvc_data_only_lib::FOO);
 }