diff --git a/crates/gpui/src/platform/test.rs b/crates/gpui/src/platform/test.rs
index 3b08985737..45948a1ba2 100644
--- a/crates/gpui/src/platform/test.rs
+++ b/crates/gpui/src/platform/test.rs
@@ -7,6 +7,6 @@ mod window;
 pub(crate) use dispatcher::*;
 pub(crate) use display::*;
 pub(crate) use platform::*;
-#[cfg(not(target_os = "macos"))]
+#[cfg(target_os = "windows")]
 pub(crate) use text_system::*;
 pub(crate) use window::*;
diff --git a/crates/gpui/src/platform/test/platform.rs b/crates/gpui/src/platform/test/platform.rs
index 3e0260b851..b56db48bd3 100644
--- a/crates/gpui/src/platform/test/platform.rs
+++ b/crates/gpui/src/platform/test/platform.rs
@@ -121,7 +121,7 @@ impl Platform for TestPlatform {
 
     fn text_system(&self) -> Arc<dyn PlatformTextSystem> {
         #[cfg(target_os = "linux")]
-        return Arc::new(crate::platform::test::TestTextSystem {});
+        return Arc::new(crate::platform::linux::LinuxTextSystem::new());
 
         #[cfg(target_os = "macos")]
         return Arc::new(crate::platform::mac::MacTextSystem::new());
diff --git a/crates/gpui/src/text_system.rs b/crates/gpui/src/text_system.rs
index 7e2a76a9dd..d5c7510db1 100644
--- a/crates/gpui/src/text_system.rs
+++ b/crates/gpui/src/text_system.rs
@@ -63,7 +63,10 @@ impl TextSystem {
                 // TODO: This is currently Zed-specific.
                 // We should allow GPUI users to provide their own fallback font stack.
                 font("Zed Mono"),
-                font("Helvetica")
+                font("Helvetica"),
+                font("Cantarell"), // Gnome
+                font("Ubuntu"),    // Gnome (Ubuntu)
+                font("Noto Sans"), // KDE
             ],
         }
     }