diff --git a/src/Compilation.zig b/src/Compilation.zig
index 8f265f9eb6..f19e83680d 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -1624,16 +1624,21 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
                 const test_pkg = if (options.test_runner_path) |test_runner| test_pkg: {
                     const test_dir = std.fs.path.dirname(test_runner);
                     const basename = std.fs.path.basename(test_runner);
-                    break :test_pkg try Package.create(gpa, "root", test_dir, basename);
-                }
-                else
-                    try Package.createWithDir(
-                        gpa,
-                        "root",
-                        options.zig_lib_directory,
-                        null,
-                        "test_runner.zig",
-                    );
+                    const pkg = try Package.create(gpa, "root", test_dir, basename);
+
+                    // copy package table from main_pkg to root_pkg
+                    var iter = main_pkg.table.valueIterator();
+                    while (iter.next()) |v| {
+                        try pkg.add(gpa, v.*);
+                    }
+                    break :test_pkg pkg;
+                } else try Package.createWithDir(
+                    gpa,
+                    "root",
+                    options.zig_lib_directory,
+                    null,
+                    "test_runner.zig",
+                );
                 errdefer test_pkg.destroy(gpa);
 
                 break :root_pkg test_pkg;
diff --git a/test/standalone/test_runner_module_imports/build.zig b/test/standalone/test_runner_module_imports/build.zig
new file mode 100644
index 0000000000..973365e495
--- /dev/null
+++ b/test/standalone/test_runner_module_imports/build.zig
@@ -0,0 +1,19 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const t = b.addTest(.{
+        .root_source_file = .{ .path = "src/main.zig" },
+    });
+    t.setTestRunner("test_runner/main.zig");
+
+    const module1 = b.createModule(.{ .source_file = .{ .path = "module1/main.zig" } });
+    const module2 = b.createModule(.{
+        .source_file = .{ .path = "module2/main.zig" },
+        .dependencies = &.{.{ .name = "module1", .module = module1 }},
+    });
+
+    t.addModule("module2", module2);
+
+    const test_step = b.step("test", "Run unit tests");
+    test_step.dependOn(&t.step);
+}
diff --git a/test/standalone/test_runner_module_imports/module1/main.zig b/test/standalone/test_runner_module_imports/module1/main.zig
new file mode 100644
index 0000000000..883c61ac7e
--- /dev/null
+++ b/test/standalone/test_runner_module_imports/module1/main.zig
@@ -0,0 +1 @@
+pub const decl: usize = 1234567890;
diff --git a/test/standalone/test_runner_module_imports/module2/main.zig b/test/standalone/test_runner_module_imports/module2/main.zig
new file mode 100644
index 0000000000..f8bb21d7df
--- /dev/null
+++ b/test/standalone/test_runner_module_imports/module2/main.zig
@@ -0,0 +1 @@
+pub const mod1 = @import("module1");
diff --git a/test/standalone/test_runner_module_imports/src/main.zig b/test/standalone/test_runner_module_imports/src/main.zig
new file mode 100644
index 0000000000..9d5d5795b6
--- /dev/null
+++ b/test/standalone/test_runner_module_imports/src/main.zig
@@ -0,0 +1,6 @@
+const mod2 = @import("module2");
+const std = @import("std");
+
+test {
+    try std.testing.expectEqual(@as(usize, 1234567890), mod2.mod1.decl);
+}
diff --git a/test/standalone/test_runner_module_imports/test_runner/main.zig b/test/standalone/test_runner_module_imports/test_runner/main.zig
new file mode 100644
index 0000000000..13ce91b88f
--- /dev/null
+++ b/test/standalone/test_runner_module_imports/test_runner/main.zig
@@ -0,0 +1,9 @@
+const std = @import("std");
+const mod2 = @import("module2");
+
+pub fn main() !void {
+    try std.testing.expectEqual(@as(usize, 1234567890), mod2.mod1.decl);
+    for (@import("builtin").test_functions) |test_fn| {
+        try test_fn.func();
+    }
+}