diff --git a/test/cases/namespace_depends_on_compile_var/a.zig b/test/cases/namespace_depends_on_compile_var/a.zig
deleted file mode 100644
index 5ce0e94f8bcf7a4c4c00d79fd1e526294ce68d28..0000000000000000000000000000000000000000
--- a/test/cases/namespace_depends_on_compile_var/a.zig
+++ /dev/null
@@ -1 +0,0 @@
-pub const a_bool = true;
diff --git a/test/cases/namespace_depends_on_compile_var/b.zig b/test/cases/namespace_depends_on_compile_var/b.zig
deleted file mode 100644
index a12a54b5891baef53855a2c43f3ffef7b17a9d4d..0000000000000000000000000000000000000000
--- a/test/cases/namespace_depends_on_compile_var/b.zig
+++ /dev/null
@@ -1 +0,0 @@
-pub const a_bool = false;
diff --git a/test/cases/namespace_depends_on_compile_var/index.zig b/test/cases/namespace_depends_on_compile_var/index.zig
deleted file mode 100644
index 3fdc207cb99ae9ac4e4f66e5fd5d374838a57070..0000000000000000000000000000000000000000
--- a/test/cases/namespace_depends_on_compile_var/index.zig
+++ /dev/null
@@ -1,17 +0,0 @@
-const assert = @import("std").debug.assert;
-
-fn namespaceDependsOnCompileVar() {
-    @setFnTest(this, true);
-
-    if (some_namespace.a_bool) {
-        assert(some_namespace.a_bool);
-    } else {
-        assert(!some_namespace.a_bool);
-    }
-}
-const some_namespace = switch(@compileVar("os")) {
-    linux => @import("a.zig"),
-    else => @import("b.zig"),
-};
-
-
diff --git a/test/cases/pub_enum/index.zig b/test/cases/pub_enum/index.zig
deleted file mode 100644
index 72ace5a1173551618333682581211dbb28bfdb54..0000000000000000000000000000000000000000
--- a/test/cases/pub_enum/index.zig
+++ /dev/null
@@ -1,19 +0,0 @@
-const assert = @import("std").debug.assert;
-const other = @import("other.zig");
-
-fn pubEnum() {
-    @setFnTest(this, true);
-
-    pubEnumTest(other.APubEnum.Two);
-}
-fn pubEnumTest(foo: other.APubEnum) {
-    assert(foo == other.APubEnum.Two);
-}
-
-fn castWithImportedSymbol() {
-    @setFnTest(this, true);
-
-    assert(other.size_t(42) == 42);
-}
-
-
diff --git a/test/cases/pub_enum/other.zig b/test/cases/pub_enum/other.zig
deleted file mode 100644
index da09843d34b36ecb5c862c8fa8bcef37fe461f96..0000000000000000000000000000000000000000
--- a/test/cases/pub_enum/other.zig
+++ /dev/null
@@ -1,6 +0,0 @@
-pub enum APubEnum {
-    One,
-    Two,
-    Three,
-}
-pub const size_t = u64;
diff --git a/test/cases3/namespace_depends_on_compile_var/a.zig b/test/cases3/namespace_depends_on_compile_var/a.zig
new file mode 100644
index 0000000000000000000000000000000000000000..5ce0e94f8bcf7a4c4c00d79fd1e526294ce68d28
--- /dev/null
+++ b/test/cases3/namespace_depends_on_compile_var/a.zig
@@ -0,0 +1 @@
+pub const a_bool = true;
diff --git a/test/cases3/namespace_depends_on_compile_var/b.zig b/test/cases3/namespace_depends_on_compile_var/b.zig
new file mode 100644
index 0000000000000000000000000000000000000000..a12a54b5891baef53855a2c43f3ffef7b17a9d4d
--- /dev/null
+++ b/test/cases3/namespace_depends_on_compile_var/b.zig
@@ -0,0 +1 @@
+pub const a_bool = false;
diff --git a/test/cases3/namespace_depends_on_compile_var/index.zig b/test/cases3/namespace_depends_on_compile_var/index.zig
new file mode 100644
index 0000000000000000000000000000000000000000..3253373cdba65218edc20b31ba7894e8ba36f45b
--- /dev/null
+++ b/test/cases3/namespace_depends_on_compile_var/index.zig
@@ -0,0 +1,19 @@
+fn namespaceDependsOnCompileVar() {
+    @setFnTest(this);
+
+    if (some_namespace.a_bool) {
+        assert(some_namespace.a_bool);
+    } else {
+        assert(!some_namespace.a_bool);
+    }
+}
+const some_namespace = switch(@compileVar("os")) {
+    Os.linux => @import("cases3/namespace_depends_on_compile_var/a.zig"),
+    else => @import("cases3/namespace_depends_on_compile_var/b.zig"),
+};
+
+// TODO const assert = @import("std").debug.assert;
+fn assert(ok: bool) {
+    if (!ok)
+        @unreachable();
+}
diff --git a/test/cases3/pub_enum/index.zig b/test/cases3/pub_enum/index.zig
new file mode 100644
index 0000000000000000000000000000000000000000..4a7cbacd43656282b5c3affcc290e56f73264849
--- /dev/null
+++ b/test/cases3/pub_enum/index.zig
@@ -0,0 +1,23 @@
+const other = @import("cases3/pub_enum/other.zig");
+
+fn pubEnum() {
+    @setFnTest(this);
+
+    pubEnumTest(other.APubEnum.Two);
+}
+fn pubEnumTest(foo: other.APubEnum) {
+    assert(foo == other.APubEnum.Two);
+}
+
+fn castWithImportedSymbol() {
+    @setFnTest(this);
+
+    assert(other.size_t(42) == 42);
+}
+
+
+// TODO const assert = @import("std").debug.assert;
+fn assert(ok: bool) {
+    if (!ok)
+        @unreachable();
+}
diff --git a/test/cases3/pub_enum/other.zig b/test/cases3/pub_enum/other.zig
new file mode 100644
index 0000000000000000000000000000000000000000..c66395038397a4d91938ff3400613ae2d734bc14
--- /dev/null
+++ b/test/cases3/pub_enum/other.zig
@@ -0,0 +1,6 @@
+pub const APubEnum = enum {
+    One,
+    Two,
+    Three,
+};
+pub const size_t = u64;
diff --git a/test/self_hosted3.zig b/test/self_hosted3.zig
index 46eac63c690adfa2e7a85655577ab48f6d5d6e9e..dd9b5ecf50736a0661a25a2eb39e5f161998b3c1 100644
--- a/test/self_hosted3.zig
+++ b/test/self_hosted3.zig
@@ -17,7 +17,9 @@ const test_if = @import("cases3/if.zig");
 const test_import = @import("cases3/import.zig");
 const test_math = @import("cases3/math.zig");
 const test_misc = @import("cases3/misc.zig");
+const test_namespace_depends_on_compile_var = @import("cases3/namespace_depends_on_compile_var/index.zig");
 const test_null = @import("cases3/null.zig");
+const test_pub_enum = @import("cases3/pub_enum/index.zig");
 const test_sizeof_and_typeof = @import("cases3/sizeof_and_typeof.zig");
 const test_struct = @import("cases3/struct.zig");
 const test_struct_contains_slice_of_itself = @import("cases3/struct_contains_slice_of_itself.zig");