diff --git a/build.zig b/build.zig
index 4385298779..8611afabde 100644
--- a/build.zig
+++ b/build.zig
@@ -460,26 +460,6 @@ pub fn build(b: *std.Build) !void {
         .max_rss = 4000000000,
     }));
 
-    test_modules_step.dependOn(tests.addModuleTests(b, .{
-        .test_filters = test_filters,
-        .test_target_filters = test_target_filters,
-        .test_extra_targets = test_extra_targets,
-        .root_src = "test/c_import.zig",
-        .name = "c-import",
-        .desc = "Run the @cImport tests",
-        .optimize_modes = optimization_modes,
-        .include_paths = &.{"test/c_import"},
-        .skip_single_threaded = true,
-        .skip_non_native = skip_non_native,
-        .skip_freebsd = skip_freebsd,
-        .skip_netbsd = skip_netbsd,
-        .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
-        .skip_linux = skip_linux,
-        .skip_llvm = skip_llvm,
-        .skip_libc = skip_libc,
-    }));
-
     test_modules_step.dependOn(tests.addModuleTests(b, .{
         .test_filters = test_filters,
         .test_target_filters = test_target_filters,
diff --git a/test/c_import.zig b/test/c_import.zig
deleted file mode 100644
index 3252648d18..0000000000
--- a/test/c_import.zig
+++ /dev/null
@@ -1,4 +0,0 @@
-test {
-    _ = @import("c_import/c_char_signedness.zig");
-    _ = @import("c_import/macros.zig");
-}
diff --git a/test/c_import/c_char_signedness.zig b/test/c_import/c_char_signedness.zig
deleted file mode 100644
index eda53e49d2..0000000000
--- a/test/c_import/c_char_signedness.zig
+++ /dev/null
@@ -1,13 +0,0 @@
-const std = @import("std");
-const builtin = @import("builtin");
-const expectEqual = std.testing.expectEqual;
-const c = @cImport({
-    @cInclude("limits.h");
-});
-
-test "c_char signedness" {
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(@as(c_char, c.CHAR_MIN), std.math.minInt(c_char));
-    try expectEqual(@as(c_char, c.CHAR_MAX), std.math.maxInt(c_char));
-}
diff --git a/test/c_import/macros.h b/test/c_import/macros.h
deleted file mode 100644
index c6e2e381e2..0000000000
--- a/test/c_import/macros.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// initializer list expression
-typedef struct Color {
-    unsigned char r;
-    unsigned char g;
-    unsigned char b;
-    unsigned char a;
-} Color;
-#define CLITERAL(type)      (type)
-#define LIGHTGRAY  CLITERAL(Color){ 200, 200, 200, 255 }   // Light Gray
-
-#define MY_SIZEOF(x) ((int)sizeof(x))
-#define MY_SIZEOF2(x) ((int)sizeof x)
-
-struct Foo {
-    int a;
-};
-
-union U {
-    long l;
-    double d;
-};
-
-#define SIZE_OF_FOO sizeof(struct Foo)
-
-#define MAP_FAILED	((void *) -1)
-
-#define IGNORE_ME_1(x) ((void)(x))
-#define IGNORE_ME_2(x) ((const void)(x))
-#define IGNORE_ME_3(x) ((volatile void)(x))
-#define IGNORE_ME_4(x) ((const volatile void)(x))
-#define IGNORE_ME_5(x) ((volatile const void)(x))
-
-#define IGNORE_ME_6(x) (void)(x)
-#define IGNORE_ME_7(x) (const void)(x)
-#define IGNORE_ME_8(x) (volatile void)(x)
-#define IGNORE_ME_9(x) (const volatile void)(x)
-#define IGNORE_ME_10(x) (volatile const void)(x)
-
-#define UNION_CAST(X) (union U)(X)
-#define CAST_OR_CALL_WITH_PARENS(type_or_fn, val) ((type_or_fn)(val))
-
-#define NESTED_COMMA_OPERATOR (1, (2, 3))
-#define NESTED_COMMA_OPERATOR_LHS (1, 2), 3
-
-#include <stdint.h>
-#if !defined(__UINTPTR_MAX__)
-typedef _Bool uintptr_t;
-#endif
-
-#define CAST_TO_BOOL(X) (_Bool)(X)
-#define CAST_TO_UINTPTR(X) (uintptr_t)(X)
-
-#define LARGE_INT 18446744073709550592
-
-#define EMBEDDED_TAB "hello	"
-
-#define DIVIDE_CONSTANT(version) (version / 1000)
-#define DIVIDE_ARGS(A, B) (A / B)
-
-#define REMAINDER_CONSTANT(version) (version % 10000)
-#define REMAINDER_ARGS(A, B) (A % B)
-
-#define LONG(x) x##L
-#define X LONG(10)
-
-#define BLANK_MACRO
-#define BLANK_CHILD_MACRO BLANK_MACRO BLANK_MACRO BLANK_MACRO
-#define MACRO_VALUE 0
-typedef long def_type;
-#define BLANK_MACRO_CAST (BLANK_CHILD_MACRO def_type BLANK_CHILD_MACRO)MACRO_VALUE
diff --git a/test/c_import/macros.zig b/test/c_import/macros.zig
deleted file mode 100644
index 2efdeb4672..0000000000
--- a/test/c_import/macros.zig
+++ /dev/null
@@ -1,239 +0,0 @@
-const builtin = @import("builtin");
-const std = @import("std");
-const expect = std.testing.expect;
-const expectEqual = std.testing.expectEqual;
-const expectEqualStrings = std.testing.expectEqualStrings;
-
-const h = @cImport(@cInclude("macros.h"));
-const latin1 = @cImport(@cInclude("macros_not_utf8.h"));
-
-test "casting to void with a macro" {
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    h.IGNORE_ME_1(42);
-    h.IGNORE_ME_2(42);
-    h.IGNORE_ME_3(42);
-    h.IGNORE_ME_4(42);
-    h.IGNORE_ME_5(42);
-    h.IGNORE_ME_6(42);
-    h.IGNORE_ME_7(42);
-    h.IGNORE_ME_8(42);
-    h.IGNORE_ME_9(42);
-    h.IGNORE_ME_10(42);
-}
-
-test "initializer list expression" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(h.Color{
-        .r = 200,
-        .g = 200,
-        .b = 200,
-        .a = 255,
-    }, h.LIGHTGRAY);
-}
-
-test "sizeof in macros" {
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expect(@as(c_int, @sizeOf(u32)) == h.MY_SIZEOF(u32));
-    try expect(@as(c_int, @sizeOf(u32)) == h.MY_SIZEOF2(u32));
-}
-
-test "reference to a struct type" {
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expect(@sizeOf(h.struct_Foo) == h.SIZE_OF_FOO);
-}
-
-test "cast negative integer to pointer" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(@as(?*anyopaque, @ptrFromInt(@as(usize, @bitCast(@as(isize, -1))))), h.MAP_FAILED);
-}
-
-test "casting to union with a macro" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    const l: c_long = 42;
-    const d: f64 = 2.0;
-
-    var casted = h.UNION_CAST(l);
-    try expect(l == casted.l);
-
-    casted = h.UNION_CAST(d);
-    try expect(d == casted.d);
-}
-
-test "casting or calling a value with a paren-surrounded macro" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    const l: c_long = 42;
-    const casted = h.CAST_OR_CALL_WITH_PARENS(c_int, l);
-    try expect(casted == @as(c_int, @intCast(l)));
-
-    const Helper = struct {
-        fn foo(n: c_int) !void {
-            try expect(n == 42);
-        }
-    };
-
-    try h.CAST_OR_CALL_WITH_PARENS(Helper.foo, 42);
-}
-
-test "nested comma operator" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(@as(c_int, 3), h.NESTED_COMMA_OPERATOR);
-    try expectEqual(@as(c_int, 3), h.NESTED_COMMA_OPERATOR_LHS);
-}
-
-test "cast functions" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    const S = struct {
-        fn foo() void {}
-    };
-    try expectEqual(true, h.CAST_TO_BOOL(S.foo));
-    try expect(h.CAST_TO_UINTPTR(S.foo) != 0);
-}
-
-test "large integer macro" {
-    if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(@as(c_ulonglong, 18446744073709550592), h.LARGE_INT);
-}
-
-test "string literal macro with embedded tab character" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqualStrings("hello\t", h.EMBEDDED_TAB);
-}
-
-test "string and char literals that are not UTF-8 encoded. Issue #12784" {
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(@as(u8, '\xA9'), latin1.UNPRINTABLE_CHAR);
-    try expectEqualStrings("\xA9\xA9\xA9", latin1.UNPRINTABLE_STRING);
-}
-
-test "Macro that uses division operator. Issue #13162" {
-    if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-    if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
-
-    try expectEqual(@as(c_int, 42), h.DIVIDE_CONSTANT(@as(c_int, 42_000)));
-    try expectEqual(@as(c_uint, 42), h.DIVIDE_CONSTANT(@as(c_uint, 42_000)));
-
-    try expectEqual(
-        @as(f64, 42.0),
-        h.DIVIDE_ARGS(
-            @as(f64, 42.0),
-            true,
-        ),
-    );
-
-    try expectEqual(
-        @as(c_int, 21),
-        h.DIVIDE_ARGS(
-            @as(i8, 42),
-            @as(i8, 2),
-        ),
-    );
-
-    try expectEqual(
-        @as(c_uint, 21),
-        h.DIVIDE_ARGS(
-            @as(u32, 42),
-            @as(u32, 2),
-        ),
-    );
-
-    try expectEqual(
-        @as(c_int, 21),
-        h.DIVIDE_ARGS(
-            @as(c_ushort, 42),
-            @as(c_ushort, 2),
-        ),
-    );
-}
-
-test "Macro that uses remainder operator. Issue #13346" {
-    if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(@as(c_int, 2_010), h.REMAINDER_CONSTANT(@as(c_int, 42_010)));
-    try expectEqual(@as(c_uint, 2_030), h.REMAINDER_CONSTANT(@as(c_uint, 42_030)));
-
-    try expectEqual(
-        @as(c_int, 7),
-        h.REMAINDER_ARGS(
-            @as(i8, 17),
-            @as(i8, 10),
-        ),
-    );
-
-    try expectEqual(
-        @as(c_int, 5),
-        h.REMAINDER_ARGS(
-            @as(c_ushort, 25),
-            @as(c_ushort, 20),
-        ),
-    );
-
-    try expectEqual(
-        @as(c_int, 1),
-        h.REMAINDER_ARGS(
-            @as(c_int, 5),
-            @as(c_int, -2),
-        ),
-    );
-}
-
-test "@typeInfo on @cImport result" {
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expect(@typeInfo(h).@"struct".decls.len > 1);
-}
-
-test "Macro that uses Long type concatenation casting" {
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expect((@TypeOf(h.X)) == c_long);
-    try expectEqual(h.X, @as(c_long, 10));
-}
-
-test "Blank macros" {
-    if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest;
-
-    try expectEqual(h.BLANK_MACRO, "");
-    try expectEqual(h.BLANK_CHILD_MACRO, "");
-    try expect(@TypeOf(h.BLANK_MACRO_CAST) == h.def_type);
-    try expectEqual(h.BLANK_MACRO_CAST, @as(c_long, 0));
-}
diff --git a/test/c_import/macros_not_utf8.h b/test/c_import/macros_not_utf8.h
deleted file mode 100644
index 0a7fa4cc6b..0000000000
--- a/test/c_import/macros_not_utf8.h
+++ /dev/null
@@ -1,5 +0,0 @@
-// Note: This file is encoded with ISO/IEC 8859-1 (latin1), not UTF-8.
-// Do not change the encoding
-
-#define UNPRINTABLE_STRING "İİİ"
-#define UNPRINTABLE_CHAR 'İ'