diff --git a/src/unicode/props_table.zig b/src/unicode/props_table.zig
index cac0a38b3..d168fbb9c 100644
--- a/src/unicode/props_table.zig
+++ b/src/unicode/props_table.zig
@@ -1,4 +1,3 @@
-const std = @import("std");
 const Properties = @import("Properties.zig");
 const lut = @import("lut.zig");
 
@@ -17,80 +16,3 @@ pub const table = table: {
         .stage3 = &generated.stage3,
     };
 };
-
-test "unicode props: tables match uucode" {
-    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
-
-    const uucode = @import("uucode");
-    const testing = std.testing;
-
-    const min = 0xFF + 1; // start outside ascii
-    const max = std.math.maxInt(u21) + 1;
-    for (min..max) |cp| {
-        const t = table.get(@intCast(cp));
-        const uu = if (cp > uucode.config.max_code_point)
-            1
-        else
-            uucode.get(.width, @intCast(cp));
-        if (t.width != uu) {
-            std.log.warn("mismatch cp=U+{x} t={} uu={}", .{ cp, t.width, uu });
-            try testing.expect(false);
-        }
-    }
-}
-
-test "unicode props: tables match ziglyph" {
-    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
-
-    const ziglyph = @import("ziglyph");
-    const testing = std.testing;
-
-    const min = 0xFF + 1; // start outside ascii
-    const max = std.math.maxInt(u21) + 1;
-    for (min..max) |cp| {
-        const t = table.get(@intCast(cp));
-        const zg = @min(2, @max(0, ziglyph.display_width.codePointWidth(@intCast(cp), .half)));
-        if (t.width != zg) {
-
-            // Known exceptions
-            if (cp == 0x0897) continue; // non-spacing mark (t = 0)
-            if (cp == 0x2065) continue; // unassigned (t = 1)
-            if (cp >= 0x2630 and cp <= 0x2637) continue; // east asian width is wide (t = 2)
-            if (cp >= 0x268A and cp <= 0x268F) continue; // east asian width is wide (t = 2)
-            if (cp >= 0x2FFC and cp <= 0x2FFF) continue; // east asian width is wide (t = 2)
-            if (cp == 0x31E4 or cp == 0x31E5) continue; // east asian width is wide (t = 2)
-            if (cp == 0x31EF) continue; // east asian width is wide (t = 2)
-            if (cp >= 0x4DC0 and cp <= 0x4DFF) continue; // east asian width is wide (t = 2)
-            if (cp >= 0xFFF0 and cp <= 0xFFF8) continue; // unassigned (t = 1)
-            if (cp >= 0xFFF0 and cp <= 0xFFF8) continue; // unassigned (t = 1)
-            if (cp >= 0x10D69 and cp <= 0x10D6D) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp >= 0x10EFC and cp <= 0x10EFF) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp >= 0x113BB and cp <= 0x113C0) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x113CE) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x113D0) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x113D2) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x113E1) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x113E2) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x1171E) continue; // mark spacing combining (t = 1)
-            if (cp == 0x11F5A) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x1611E) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x1611F) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp >= 0x16120 and cp <= 0x1612F) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp >= 0xE0000 and cp <= 0xE0FFF) continue; // ziglyph ignores these with 0, but many are unassigned (t = 1)
-            if (cp == 0x18CFF) continue; // east asian width is wide (t = 2)
-            if (cp >= 0x1D300 and cp <= 0x1D376) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1E5EE) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x1E5EF) continue; // non-spacing mark, despite being east asian width normal (t = 0)
-            if (cp == 0x1FA89) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1FA8F) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1FABE) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1FAC6) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1FADC) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1FADF) continue; // east asian width is wide (t = 2)
-            if (cp == 0x1FAE9) continue; // east asian width is wide (t = 2)
-
-            std.log.warn("mismatch cp=U+{x} t={} zg={}", .{ cp, t.width, zg });
-            try testing.expect(false);
-        }
-    }
-}
diff --git a/src/unicode/props_uucode.zig b/src/unicode/props_uucode.zig
index fe9de37ab..71edac4fb 100644
--- a/src/unicode/props_uucode.zig
+++ b/src/unicode/props_uucode.zig
@@ -93,3 +93,81 @@ pub fn main() !void {
     //     t.stage3.len,
     // });
 }
+
+test "unicode props: tables match uucode" {
+    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
+
+    const testing = std.testing;
+    const table = @import("props_table.zig").table;
+
+    const min = 0xFF + 1; // start outside ascii
+    const max = std.math.maxInt(u21) + 1;
+    for (min..max) |cp| {
+        const t = table.get(@intCast(cp));
+        const uu = if (cp > uucode.config.max_code_point)
+            1
+        else
+            uucode.get(.width, @intCast(cp));
+        if (t.width != uu) {
+            std.log.warn("mismatch cp=U+{x} t={} uu={}", .{ cp, t.width, uu });
+            try testing.expect(false);
+        }
+    }
+}
+
+test "unicode props: tables match ziglyph" {
+    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
+
+    const testing = std.testing;
+    const table = @import("props_table.zig").table;
+    const ziglyph = @import("ziglyph");
+
+    const min = 0xFF + 1; // start outside ascii
+    const max = std.math.maxInt(u21) + 1;
+    for (min..max) |cp| {
+        const t = table.get(@intCast(cp));
+        const zg = @min(2, @max(0, ziglyph.display_width.codePointWidth(@intCast(cp), .half)));
+        if (t.width != zg) {
+
+            // Known exceptions
+            if (cp == 0x0897) continue; // non-spacing mark (t = 0)
+            if (cp == 0x2065) continue; // unassigned (t = 1)
+            if (cp >= 0x2630 and cp <= 0x2637) continue; // east asian width is wide (t = 2)
+            if (cp >= 0x268A and cp <= 0x268F) continue; // east asian width is wide (t = 2)
+            if (cp >= 0x2FFC and cp <= 0x2FFF) continue; // east asian width is wide (t = 2)
+            if (cp == 0x31E4 or cp == 0x31E5) continue; // east asian width is wide (t = 2)
+            if (cp == 0x31EF) continue; // east asian width is wide (t = 2)
+            if (cp >= 0x4DC0 and cp <= 0x4DFF) continue; // east asian width is wide (t = 2)
+            if (cp >= 0xFFF0 and cp <= 0xFFF8) continue; // unassigned (t = 1)
+            if (cp >= 0xFFF0 and cp <= 0xFFF8) continue; // unassigned (t = 1)
+            if (cp >= 0x10D69 and cp <= 0x10D6D) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp >= 0x10EFC and cp <= 0x10EFF) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp >= 0x113BB and cp <= 0x113C0) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x113CE) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x113D0) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x113D2) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x113E1) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x113E2) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x1171E) continue; // mark spacing combining (t = 1)
+            if (cp == 0x11F5A) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x1611E) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x1611F) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp >= 0x16120 and cp <= 0x1612F) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp >= 0xE0000 and cp <= 0xE0FFF) continue; // ziglyph ignores these with 0, but many are unassigned (t = 1)
+            if (cp == 0x18CFF) continue; // east asian width is wide (t = 2)
+            if (cp >= 0x1D300 and cp <= 0x1D376) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1E5EE) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x1E5EF) continue; // non-spacing mark, despite being east asian width normal (t = 0)
+            if (cp == 0x1FA89) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1FA8F) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1FABE) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1FAC6) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1FADC) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1FADF) continue; // east asian width is wide (t = 2)
+            if (cp == 0x1FAE9) continue; // east asian width is wide (t = 2)
+
+            std.log.warn("mismatch cp=U+{x} t={} zg={}", .{ cp, t.width, zg });
+            try testing.expect(false);
+        }
+    }
+}
diff --git a/src/unicode/symbols_table.zig b/src/unicode/symbols_table.zig
index da2614cae..034d34428 100644
--- a/src/unicode/symbols_table.zig
+++ b/src/unicode/symbols_table.zig
@@ -1,4 +1,3 @@
-const std = @import("std");
 const lut = @import("lut.zig");
 
 /// The lookup tables for Ghostty.
@@ -16,48 +15,3 @@ pub const table = table: {
         .stage3 = &generated.stage3,
     };
 };
-
-test "unicode symbols: tables match uucode" {
-    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
-
-    const uucode = @import("uucode");
-    const testing = std.testing;
-
-    for (0..std.math.maxInt(u21)) |cp| {
-        const t = table.get(@intCast(cp));
-        const uu = if (cp > uucode.config.max_code_point)
-            false
-        else
-            uucode.get(.is_symbol, @intCast(cp));
-
-        if (t != uu) {
-            std.log.warn("mismatch cp=U+{x} t={} uu={}", .{ cp, t, uu });
-            try testing.expect(false);
-        }
-    }
-}
-
-test "unicode symbols: tables match ziglyph" {
-    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
-
-    const ziglyph = @import("ziglyph");
-    const testing = std.testing;
-
-    for (0..std.math.maxInt(u21)) |cp_usize| {
-        const cp: u21 = @intCast(cp_usize);
-        const t = table.get(cp);
-        const zg = ziglyph.general_category.isPrivateUse(cp) or
-            ziglyph.blocks.isDingbats(cp) or
-            ziglyph.blocks.isEmoticons(cp) or
-            ziglyph.blocks.isMiscellaneousSymbols(cp) or
-            ziglyph.blocks.isEnclosedAlphanumerics(cp) or
-            ziglyph.blocks.isEnclosedAlphanumericSupplement(cp) or
-            ziglyph.blocks.isMiscellaneousSymbolsAndPictographs(cp) or
-            ziglyph.blocks.isTransportAndMapSymbols(cp);
-
-        if (t != zg) {
-            std.log.warn("mismatch cp=U+{x} t={} zg={}", .{ cp, t, zg });
-            try testing.expect(false);
-        }
-    }
-}
diff --git a/src/unicode/symbols_uucode.zig b/src/unicode/symbols_uucode.zig
index d78a2b234..985ed1380 100644
--- a/src/unicode/symbols_uucode.zig
+++ b/src/unicode/symbols_uucode.zig
@@ -39,3 +39,49 @@ pub fn main() !void {
     //     t.stage3.len,
     // });
 }
+
+test "unicode symbols: tables match uucode" {
+    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
+
+    const testing = std.testing;
+    const table = @import("symbols_table.zig").table;
+
+    for (0..std.math.maxInt(u21)) |cp| {
+        const t = table.get(@intCast(cp));
+        const uu = if (cp > uucode.config.max_code_point)
+            false
+        else
+            uucode.get(.is_symbol, @intCast(cp));
+
+        if (t != uu) {
+            std.log.warn("mismatch cp=U+{x} t={} uu={}", .{ cp, t, uu });
+            try testing.expect(false);
+        }
+    }
+}
+
+test "unicode symbols: tables match ziglyph" {
+    if (std.valgrind.runningOnValgrind() > 0) return error.SkipZigTest;
+
+    const testing = std.testing;
+    const table = @import("symbols_table.zig").table;
+    const ziglyph = @import("ziglyph");
+
+    for (0..std.math.maxInt(u21)) |cp_usize| {
+        const cp: u21 = @intCast(cp_usize);
+        const t = table.get(cp);
+        const zg = ziglyph.general_category.isPrivateUse(cp) or
+            ziglyph.blocks.isDingbats(cp) or
+            ziglyph.blocks.isEmoticons(cp) or
+            ziglyph.blocks.isMiscellaneousSymbols(cp) or
+            ziglyph.blocks.isEnclosedAlphanumerics(cp) or
+            ziglyph.blocks.isEnclosedAlphanumericSupplement(cp) or
+            ziglyph.blocks.isMiscellaneousSymbolsAndPictographs(cp) or
+            ziglyph.blocks.isTransportAndMapSymbols(cp);
+
+        if (t != zg) {
+            std.log.warn("mismatch cp=U+{x} t={} zg={}", .{ cp, t, zg });
+            try testing.expect(false);
+        }
+    }
+}