diff --git a/test/cases/pic_freestanding.zig b/test/cases/pic_freestanding.zig
deleted file mode 100644
index fc24aeb52b..0000000000
--- a/test/cases/pic_freestanding.zig
+++ /dev/null
@@ -1,14 +0,0 @@
-const builtin = @import("builtin");
-const std = @import("std");
-
-pub fn _start() callconv(.naked) void {}
-
-comptime {
-    @export(&_start, .{ .name = if (builtin.cpu.arch.isMIPS()) "__start" else "_start" });
-}
-
-// compile
-// backend=selfhosted,llvm
-// target=arm-freestanding,armeb-freestanding,thumb-freestanding,thumbeb-freestanding,aarch64-freestanding,aarch64_be-freestanding,loongarch64-freestanding,mips-freestanding,mipsel-freestanding,mips64-freestanding,mips64el-freestanding,powerpc-freestanding,powerpcle-freestanding,powerpc64-freestanding,powerpc64le-freestanding,riscv32-freestanding,riscv64-freestanding,s390x-freestanding,x86-freestanding,x86_64-freestanding
-// pic=true
-// output_mode=Exe
diff --git a/test/cases/pic_linux.zig b/test/cases/pic_linux.zig
deleted file mode 100644
index 016189b0f8..0000000000
--- a/test/cases/pic_linux.zig
+++ /dev/null
@@ -1,14 +0,0 @@
-const std = @import("std");
-
-// Eventually, this test should be made to work without libc by providing our
-// own `__tls_get_addr` implementation. powerpcle-linux should be added to the
-// target list here when that happens.
-//
-// https://github.com/ziglang/zig/issues/20625
-pub fn main() void {}
-
-// run
-// backend=selfhosted,llvm
-// target=arm-linux,armeb-linux,thumb-linux,thumbeb-linux,aarch64-linux,aarch64_be-linux,loongarch64-linux,mips-linux,mipsel-linux,mips64-linux,mips64el-linux,powerpc-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-linux,s390x-linux,x86-linux,x86_64-linux
-// pic=true
-// link_libc=true
diff --git a/test/cases/pie_freestanding.zig b/test/cases/pie_freestanding.zig
deleted file mode 100644
index 9a86ddbc42..0000000000
--- a/test/cases/pie_freestanding.zig
+++ /dev/null
@@ -1,16 +0,0 @@
-const builtin = @import("builtin");
-const std = @import("std");
-
-// The self-hosted backends currently output a bunch of bad relocations for PIE,
-// so this test is LLVM only for now.
-fn _start() callconv(.naked) void {}
-
-comptime {
-    @export(&_start, .{ .name = if (builtin.cpu.arch.isMIPS()) "__start" else "_start" });
-}
-
-// compile
-// backend=llvm
-// target=arm-freestanding,armeb-freestanding,thumb-freestanding,thumbeb-freestanding,aarch64-freestanding,aarch64_be-freestanding,loongarch64-freestanding,mips-freestanding,mipsel-freestanding,mips64-freestanding,mips64el-freestanding,powerpc-freestanding,powerpcle-freestanding,powerpc64-freestanding,powerpc64le-freestanding,riscv32-freestanding,riscv64-freestanding,s390x-freestanding,x86-freestanding,x86_64-freestanding
-// pie=true
-// output_mode=Exe
diff --git a/test/cases/pie_linux.zig b/test/cases/pie_linux.zig
deleted file mode 100644
index 293a172e9c..0000000000
--- a/test/cases/pie_linux.zig
+++ /dev/null
@@ -1,10 +0,0 @@
-const std = @import("std");
-
-// The self-hosted backends can't handle `.hidden _DYNAMIC` and `.weak _DYNAMIC`
-// directives in inline assembly yet, so this test is LLVM only for now.
-pub fn main() void {}
-
-// run
-// backend=llvm
-// target=arm-linux,armeb-linux,thumb-linux,thumbeb-linux,aarch64-linux,aarch64_be-linux,loongarch64-linux,mips-linux,mipsel-linux,mips64-linux,mips64el-linux,powerpc-linux,powerpcle-linux,powerpc64-linux,powerpc64le-linux,riscv32-linux,riscv64-linux,s390x-linux,x86-linux,x86_64-linux
-// pie=true
diff --git a/test/standalone/build.zig.zon b/test/standalone/build.zig.zon
index 79164fe7e0..63724548a2 100644
--- a/test/standalone/build.zig.zon
+++ b/test/standalone/build.zig.zon
@@ -193,9 +193,6 @@
         .empty_global_error_set = .{
             .path = "empty_global_error_set",
         },
-        .omit_cfi = .{
-            .path = "omit_cfi",
-        },
         .config_header = .{
             .path = "config_header",
         },
diff --git a/test/standalone/omit_cfi/build.zig b/test/standalone/omit_cfi/build.zig
deleted file mode 100644
index 62f9fed471..0000000000
--- a/test/standalone/omit_cfi/build.zig
+++ /dev/null
@@ -1,67 +0,0 @@
-const std = @import("std");
-
-pub fn build(b: *std.Build) void {
-    inline for (.{
-        .aarch64,
-        .aarch64_be,
-        .hexagon,
-        .loongarch64,
-        .mips,
-        .mipsel,
-        .mips64,
-        .mips64el,
-        .powerpc,
-        .powerpcle,
-        .powerpc64,
-        .powerpc64le,
-        .riscv32,
-        .riscv64,
-        .s390x,
-        .sparc64,
-        .x86,
-        .x86_64,
-    }) |arch| {
-        const target = b.resolveTargetQuery(.{
-            .cpu_arch = arch,
-            .os_tag = .linux,
-        });
-
-        const omit_dbg = b.addExecutable(.{
-            .name = b.fmt("{s}-linux-omit-dbg", .{@tagName(arch)}),
-            .root_module = b.createModule(.{
-                .root_source_file = b.path("main.zig"),
-                .target = target,
-                .optimize = .Debug,
-                // We are mainly concerned with CFI directives in our non-libc startup code and syscall
-                // code, so make it explicit that we don't want libc.
-                .link_libc = false,
-                .strip = true,
-            }),
-        });
-
-        const omit_uwt = b.addExecutable(.{
-            .name = b.fmt("{s}-linux-omit-uwt", .{@tagName(arch)}),
-            .root_module = b.createModule(.{
-                .root_source_file = b.path("main.zig"),
-                .target = target,
-                .optimize = .Debug,
-                .link_libc = false,
-                .unwind_tables = .none,
-            }),
-        });
-
-        const omit_both = b.addExecutable(.{
-            .name = b.fmt("{s}-linux-omit-both", .{@tagName(arch)}),
-            .root_module = b.createModule(.{
-                .root_source_file = b.path("main.zig"),
-                .target = target,
-                .optimize = .Debug,
-                .link_libc = false,
-                .strip = true,
-                .unwind_tables = .none,
-            }),
-        });
-
-        inline for (.{ omit_dbg, omit_uwt, omit_both }) |step| b.installArtifact(step);
-    }
-}
diff --git a/test/standalone/omit_cfi/main.zig b/test/standalone/omit_cfi/main.zig
deleted file mode 100644
index 902b554db0..0000000000
--- a/test/standalone/omit_cfi/main.zig
+++ /dev/null
@@ -1 +0,0 @@
-pub fn main() void {}