diff --git a/test/cases/main_return_error_u8.zig b/test/cases/main_return_error_u8.zig
new file mode 100644
index 0000000000000000000000000000000000000000..3607e355dd6eb9a22aa8385db95618f15f60da50
--- /dev/null
+++ b/test/cases/main_return_error_u8.zig
@@ -0,0 +1,8 @@
+const Err = error{Foo};
+
+pub fn main() !u8 {
+    return Err.Foo;
+}
+
+// compile
+// output_mode=Exe
diff --git a/test/cases/main_return_error_u8_non_zero.zig b/test/cases/main_return_error_u8_non_zero.zig
new file mode 100644
index 0000000000000000000000000000000000000000..278223c114e3dbe7d7fe853ee05758a95ac97bfa
--- /dev/null
+++ b/test/cases/main_return_error_u8_non_zero.zig
@@ -0,0 +1,13 @@
+const Err = error{Foo};
+
+fn foo() u8 {
+    return @intCast(9);
+}
+
+pub fn main() !u8 {
+    if (foo() == 7) return Err.Foo;
+    return 123;
+}
+
+// compile
+// output_mode=Exe
diff --git a/test/cases/noreturn_call_as_arg.zig b/test/cases/noreturn_call_as_arg.zig
new file mode 100644
index 0000000000000000000000000000000000000000..c9c792c02754c10c8965b2fc9f1b3d24103610a9
--- /dev/null
+++ b/test/cases/noreturn_call_as_arg.zig
@@ -0,0 +1,13 @@
+const std = @import("std");
+
+fn foo() noreturn {
+    std.process.exit(0);
+}
+
+fn bar(_: u8, _: u8) void {}
+
+pub fn main() void {
+    bar(foo(), @compileError("bad"));
+}
+
+// run
diff --git a/test/cases/noreturn_call_inline.zig b/test/cases/noreturn_call_inline.zig
new file mode 100644
index 0000000000000000000000000000000000000000..966c8cad54d584cfd4ca818bc7a8e631022530fe
--- /dev/null
+++ b/test/cases/noreturn_call_inline.zig
@@ -0,0 +1,15 @@
+const std = @import("std");
+
+pub fn main() void {
+    _ = bar();
+}
+
+inline fn bar() u8 {
+    noret();
+}
+
+inline fn noret() noreturn {
+    std.process.exit(0);
+}
+
+// run
diff --git a/test/standalone/simple/build.zig b/test/standalone/simple/build.zig
index 730c3fc25c0259bc3f73a393add8e06871489f7b..43c0fae68ff2d8cdad96ce115c5ba1945b579d8d 100644
--- a/test/standalone/simple/build.zig
+++ b/test/standalone/simple/build.zig
@@ -105,9 +105,5 @@ const cases = [_]Case{
         },
     },
     .{ .src_path = "guess_number/main.zig" },
-    .{ .src_path = "main_return_error/error_u8.zig" },
-    .{ .src_path = "main_return_error/error_u8_non_zero.zig" },
-    .{ .src_path = "noreturn_call/inline.zig" },
-    .{ .src_path = "noreturn_call/as_arg.zig" },
     .{ .src_path = "std_enums_big_enums.zig" },
 };
diff --git a/test/standalone/simple/main_return_error/error_u8.zig b/test/standalone/simple/main_return_error/error_u8.zig
deleted file mode 100644
index 8fbe1e8f6595e350964d9ba61e4c94091988fe9c..0000000000000000000000000000000000000000
--- a/test/standalone/simple/main_return_error/error_u8.zig
+++ /dev/null
@@ -1,5 +0,0 @@
-const Err = error{Foo};
-
-pub fn main() !u8 {
-    return Err.Foo;
-}
diff --git a/test/standalone/simple/main_return_error/error_u8_non_zero.zig b/test/standalone/simple/main_return_error/error_u8_non_zero.zig
deleted file mode 100644
index 47fe7946ec1e4ce6fdd33a749fc11d313eb3f3ab..0000000000000000000000000000000000000000
--- a/test/standalone/simple/main_return_error/error_u8_non_zero.zig
+++ /dev/null
@@ -1,10 +0,0 @@
-const Err = error{Foo};
-
-fn foo() u8 {
-    return @intCast(9);
-}
-
-pub fn main() !u8 {
-    if (foo() == 7) return Err.Foo;
-    return 123;
-}
diff --git a/test/standalone/simple/noreturn_call/as_arg.zig b/test/standalone/simple/noreturn_call/as_arg.zig
deleted file mode 100644
index 08a4f0bd75803280775cd7644bec88b850e0b344..0000000000000000000000000000000000000000
--- a/test/standalone/simple/noreturn_call/as_arg.zig
+++ /dev/null
@@ -1,8 +0,0 @@
-const std = @import("std");
-fn foo() noreturn {
-    std.process.exit(0);
-}
-fn bar(_: u8, _: u8) void {}
-pub fn main() void {
-    bar(foo(), @compileError("bad"));
-}
diff --git a/test/standalone/simple/noreturn_call/inline.zig b/test/standalone/simple/noreturn_call/inline.zig
deleted file mode 100644
index 436d97896a774f5a84fa344822c9668026c4a432..0000000000000000000000000000000000000000
--- a/test/standalone/simple/noreturn_call/inline.zig
+++ /dev/null
@@ -1,10 +0,0 @@
-pub fn main() void {
-    _ = bar();
-}
-inline fn bar() u8 {
-    noret();
-}
-const std = @import("std");
-inline fn noret() noreturn {
-    std.process.exit(0);
-}