diff --git a/src/tools/tidy/src/allowed_run_make_makefiles.txt b/src/tools/tidy/src/allowed_run_make_makefiles.txt
index 75cd2b4c77317..c47361ebc0597 100644
--- a/src/tools/tidy/src/allowed_run_make_makefiles.txt
+++ b/src/tools/tidy/src/allowed_run_make_makefiles.txt
@@ -72,7 +72,6 @@ run-make/forced-unwind-terminate-pof/Makefile
 run-make/foreign-double-unwind/Makefile
 run-make/foreign-exceptions/Makefile
 run-make/foreign-rust-exceptions/Makefile
-run-make/fpic/Makefile
 run-make/glibc-staticlib-args/Makefile
 run-make/inaccessible-temp-dir/Makefile
 run-make/include_bytes_deps/Makefile
@@ -103,7 +102,6 @@ run-make/issue-33329/Makefile
 run-make/issue-35164/Makefile
 run-make/issue-36710/Makefile
 run-make/issue-37839/Makefile
-run-make/issue-37893/Makefile
 run-make/issue-40535/Makefile
 run-make/issue-47384/Makefile
 run-make/issue-47551/Makefile
@@ -235,7 +233,6 @@ run-make/share-generics-dylib/Makefile
 run-make/short-ice/Makefile
 run-make/silly-file-names/Makefile
 run-make/simd-ffi/Makefile
-run-make/simple-dylib/Makefile
 run-make/split-debuginfo/Makefile
 run-make/stable-symbol-names/Makefile
 run-make/static-dylib-by-default/Makefile
diff --git a/tests/run-make/fpic/Makefile b/tests/run-make/fpic/Makefile
deleted file mode 100644
index d3754d17372ff..0000000000000
--- a/tests/run-make/fpic/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# ignore-cross-compile
-include ../tools.mk
-
-# ignore-windows
-# ignore-apple
-
-# Test for #39529.
-# `-z text` causes ld to error if there are any non-PIC sections
-
-all:
-	$(RUSTC) hello.rs -C link-args=-Wl,-z,text
diff --git a/tests/run-make/fpic/hello.rs b/tests/run-make/fpic/hello.rs
deleted file mode 100644
index 45590d86ba6c5..0000000000000
--- a/tests/run-make/fpic/hello.rs
+++ /dev/null
@@ -1 +0,0 @@
-fn main() { }
diff --git a/tests/run-make/issue-37893/Makefile b/tests/run-make/issue-37893/Makefile
deleted file mode 100644
index 44e4a321a30a5..0000000000000
--- a/tests/run-make/issue-37893/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# ignore-cross-compile
-include ../tools.mk
-
-all:
-	$(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs
diff --git a/tests/run-make/issue-37893/a.rs b/tests/run-make/proc-macro-init-order/a.rs
similarity index 100%
rename from tests/run-make/issue-37893/a.rs
rename to tests/run-make/proc-macro-init-order/a.rs
diff --git a/tests/run-make/issue-37893/b.rs b/tests/run-make/proc-macro-init-order/b.rs
similarity index 100%
rename from tests/run-make/issue-37893/b.rs
rename to tests/run-make/proc-macro-init-order/b.rs
diff --git a/tests/run-make/issue-37893/c.rs b/tests/run-make/proc-macro-init-order/c.rs
similarity index 100%
rename from tests/run-make/issue-37893/c.rs
rename to tests/run-make/proc-macro-init-order/c.rs
diff --git a/tests/run-make/proc-macro-init-order/rmake.rs b/tests/run-make/proc-macro-init-order/rmake.rs
new file mode 100644
index 0000000000000..3c3fc813381c5
--- /dev/null
+++ b/tests/run-make/proc-macro-init-order/rmake.rs
@@ -0,0 +1,15 @@
+// a.rs is a procedural macro crate, on which b.rs and c.rs depend. A now
+// patched bug caused a compilation failure if the proc-macro crate was
+// initialized with its dependents in this exact order. This test checks
+// that compilation succeeds even when initialization is done in this order.
+// See https://github.com/rust-lang/rust/issues/37893
+
+//@ ignore-cross-compile
+
+use run_make_support::rustc;
+
+fn main() {
+    rustc().input("a.rs").run();
+    rustc().input("b.rs").run();
+    rustc().input("c.rs").run();
+}
diff --git a/tests/run-make/simple-dylib/Makefile b/tests/run-make/simple-dylib/Makefile
deleted file mode 100644
index f3e1c1da88cec..0000000000000
--- a/tests/run-make/simple-dylib/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# ignore-cross-compile
-include ../tools.mk
-all:
-	$(RUSTC) bar.rs --crate-type=dylib -C prefer-dynamic
-	$(RUSTC) foo.rs
-	$(call RUN,foo)
diff --git a/tests/run-make/simple-dylib/bar.rs b/tests/run-make/simple-dylib/bar.rs
deleted file mode 100644
index c5c0bc606cd69..0000000000000
--- a/tests/run-make/simple-dylib/bar.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub fn bar() {}
diff --git a/tests/run-make/simple-dylib/foo.rs b/tests/run-make/simple-dylib/foo.rs
deleted file mode 100644
index 8d68535e3b647..0000000000000
--- a/tests/run-make/simple-dylib/foo.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-extern crate bar;
-
-fn main() {
-    bar::bar();
-}
diff --git a/tests/ui/errors/pic-linker.rs b/tests/ui/errors/pic-linker.rs
new file mode 100644
index 0000000000000..d90989903048e
--- /dev/null
+++ b/tests/ui/errors/pic-linker.rs
@@ -0,0 +1,12 @@
+// `-z text` caused the linker to error if there were any non-position-independent
+// code (PIC) sections. This test checks that this no longer happens.
+// See https://github.com/rust-lang/rust/pull/39803
+
+//@ ignore-windows
+//@ ignore-macos
+//@ ignore-cross-compile
+
+//@ compile-flags: -Clink-args=-Wl,-z,text
+//@ run-pass
+
+fn main() {}
diff --git a/tests/ui/imports/auxiliary/simple-dylib.rs b/tests/ui/imports/auxiliary/simple-dylib.rs
new file mode 100644
index 0000000000000..af64aa66f31b4
--- /dev/null
+++ b/tests/ui/imports/auxiliary/simple-dylib.rs
@@ -0,0 +1,4 @@
+//@ compile-flags: -Cprefer-dynamic
+
+#![crate_type = "dylib"]
+pub fn bar() {}
diff --git a/tests/ui/imports/simple-dylib-import.rs b/tests/ui/imports/simple-dylib-import.rs
new file mode 100644
index 0000000000000..d8ee3496b90dd
--- /dev/null
+++ b/tests/ui/imports/simple-dylib-import.rs
@@ -0,0 +1,12 @@
+// A simple test, where foo.rs has a dependency
+// on the dynamic library simple-dylib.rs. If the test passes,
+// dylibs can be built and linked into another file successfully..
+
+//@ aux-crate:bar=simple-dylib.rs
+//@ run-pass
+
+extern crate bar;
+
+fn main() {
+    bar::bar();
+}