diff --git a/components/gfx/text/util.rs b/components/gfx/text/util.rs
index 4b8f5041143..42bba6c449e 100644
--- a/components/gfx/text/util.rs
+++ b/components/gfx/text/util.rs
@@ -127,163 +127,3 @@ pub fn fixed_to_rounded_int(before: int, f: i32) -> int {
        -((half - f) >> before as uint) as int
     }
 }
-
-#[test]
-fn test_transform_compress_none() {
-    let test_strs = [
-        "  foo bar",
-        "foo bar  ",
-        "foo\n bar",
-        "foo \nbar",
-        "  foo  bar  \nbaz",
-        "foo bar baz",
-        "foobarbaz\n\n",
-    ];
-
-    let mode = CompressionMode::CompressNone;
-    for &test in test_strs.iter() {
-        let mut new_line_pos = vec![];
-        let mut trimmed_str = String::new();
-        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
-        assert_eq!(trimmed_str.as_slice(), test)
-    }
-}
-
-#[test]
-fn test_transform_discard_newline() {
-    let test_strs = [
-        ("  foo bar",
-         "  foo bar"),
-
-        ("foo bar  ",
-         "foo bar  "),
-
-        ("foo\n bar",
-         "foo bar"),
-
-        ("foo \nbar",
-         "foo bar"),
-
-        ("  foo  bar  \nbaz",
-         "  foo  bar  baz"),
-
-        ("foo bar baz",
-         "foo bar baz"),
-
-        ("foobarbaz\n\n",
-         "foobarbaz"),
-    ];
-
-    let mode = CompressionMode::DiscardNewline;
-    for &(test, oracle) in test_strs.iter() {
-        let mut new_line_pos = vec![];
-        let mut trimmed_str = String::new();
-        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
-        assert_eq!(trimmed_str.as_slice(), oracle)
-    }
-}
-
-#[test]
-fn test_transform_compress_whitespace() {
-    let test_strs = [
-        ("  foo bar",
-         "foo bar"),
-
-        ("foo bar  ",
-         "foo bar "),
-
-        ("foo\n bar",
-         "foo\n bar"),
-
-        ("foo \nbar",
-         "foo \nbar"),
-
-        ("  foo  bar  \nbaz",
-         "foo bar \nbaz"),
-
-        ("foo bar baz",
-         "foo bar baz"),
-
-        ("foobarbaz\n\n",
-         "foobarbaz\n\n"),
-    ];
-
-    let mode = CompressionMode::CompressWhitespace;
-    for &(test, oracle) in test_strs.iter() {
-        let mut new_line_pos = vec![];
-        let mut trimmed_str = String::new();
-        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
-        assert_eq!(&*trimmed_str, oracle)
-    }
-}
-
-#[test]
-fn test_transform_compress_whitespace_newline() {
-    let test_strs = vec![
-        ("  foo bar",
-         "foo bar"),
-
-        ("foo bar  ",
-         "foo bar "),
-
-        ("foo\n bar",
-         "foo bar"),
-
-        ("foo \nbar",
-         "foo bar"),
-
-        ("  foo  bar  \nbaz",
-         "foo bar baz"),
-
-        ("foo bar baz",
-         "foo bar baz"),
-
-        ("foobarbaz\n\n",
-         "foobarbaz "),
-    ];
-
-    let mode = CompressionMode::CompressWhitespaceNewline;
-    for &(test, oracle) in test_strs.iter() {
-        let mut new_line_pos = vec![];
-        let mut trimmed_str = String::new();
-        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
-        assert_eq!(&*trimmed_str, oracle)
-    }
-}
-
-#[test]
-fn test_transform_compress_whitespace_newline_no_incoming() {
-    let test_strs = [
-        ("  foo bar",
-         " foo bar"),
-
-        ("\nfoo bar",
-         " foo bar"),
-
-        ("foo bar  ",
-         "foo bar "),
-
-        ("foo\n bar",
-         "foo bar"),
-
-        ("foo \nbar",
-         "foo bar"),
-
-        ("  foo  bar  \nbaz",
-         " foo bar baz"),
-
-        ("foo bar baz",
-         "foo bar baz"),
-
-        ("foobarbaz\n\n",
-         "foobarbaz "),
-    ];
-
-    let mode = CompressionMode::CompressWhitespaceNewline;
-    for &(test, oracle) in test_strs.iter() {
-        let mut new_line_pos = vec![];
-        let mut trimmed_str = String::new();
-        transform_text(test, mode, false, &mut trimmed_str, &mut new_line_pos);
-        assert_eq!(trimmed_str.as_slice(), oracle)
-    }
-}
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index c42dc862a73..4e01bc323ac 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -926,6 +926,7 @@ name = "unit_tests"
 version = "0.0.1"
 dependencies = [
  "geom 0.1.0 (git+https://github.com/servo/rust-geom)",
+ "gfx 0.0.1",
  "util 0.0.1",
 ]
 
diff --git a/tests/unit/Cargo.toml b/tests/unit/Cargo.toml
index 8f3fcd0545b..a6b96b54cef 100644
--- a/tests/unit/Cargo.toml
+++ b/tests/unit/Cargo.toml
@@ -11,5 +11,8 @@ doctest = false
 [dependencies.util]
 path = "../../components/util"
 
+[dependencies.gfx]
+path = "../../components/gfx"
+
 [dependencies.geom]
 git = "https://github.com/servo/rust-geom"
diff --git a/tests/unit/gfx/mod.rs b/tests/unit/gfx/mod.rs
new file mode 100644
index 00000000000..7c87bd17b39
--- /dev/null
+++ b/tests/unit/gfx/mod.rs
@@ -0,0 +1 @@
+mod text_util;
diff --git a/tests/unit/gfx/text_util.rs b/tests/unit/gfx/text_util.rs
new file mode 100644
index 00000000000..83e90b6a064
--- /dev/null
+++ b/tests/unit/gfx/text_util.rs
@@ -0,0 +1,161 @@
+use gfx::text::util::{CompressionMode, transform_text};
+
+#[test]
+fn test_transform_compress_none() {
+    let test_strs = [
+        "  foo bar",
+        "foo bar  ",
+        "foo\n bar",
+        "foo \nbar",
+        "  foo  bar  \nbaz",
+        "foo bar baz",
+        "foobarbaz\n\n",
+    ];
+
+    let mode = CompressionMode::CompressNone;
+    for &test in test_strs.iter() {
+        let mut new_line_pos = vec![];
+        let mut trimmed_str = String::new();
+        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
+        assert_eq!(trimmed_str, test)
+    }
+}
+
+#[test]
+fn test_transform_discard_newline() {
+    let test_strs = [
+        ("  foo bar",
+         "  foo bar"),
+
+        ("foo bar  ",
+         "foo bar  "),
+
+        ("foo\n bar",
+         "foo bar"),
+
+        ("foo \nbar",
+         "foo bar"),
+
+        ("  foo  bar  \nbaz",
+         "  foo  bar  baz"),
+
+        ("foo bar baz",
+         "foo bar baz"),
+
+        ("foobarbaz\n\n",
+         "foobarbaz"),
+    ];
+
+    let mode = CompressionMode::DiscardNewline;
+    for &(test, oracle) in test_strs.iter() {
+        let mut new_line_pos = vec![];
+        let mut trimmed_str = String::new();
+        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
+        assert_eq!(trimmed_str, oracle)
+    }
+}
+
+#[test]
+fn test_transform_compress_whitespace() {
+    let test_strs = [
+        ("  foo bar",
+         "foo bar"),
+
+        ("foo bar  ",
+         "foo bar "),
+
+        ("foo\n bar",
+         "foo\n bar"),
+
+        ("foo \nbar",
+         "foo \nbar"),
+
+        ("  foo  bar  \nbaz",
+         "foo bar \nbaz"),
+
+        ("foo bar baz",
+         "foo bar baz"),
+
+        ("foobarbaz\n\n",
+         "foobarbaz\n\n"),
+    ];
+
+    let mode = CompressionMode::CompressWhitespace;
+    for &(test, oracle) in test_strs.iter() {
+        let mut new_line_pos = vec![];
+        let mut trimmed_str = String::new();
+        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
+        assert_eq!(&*trimmed_str, oracle)
+    }
+}
+
+#[test]
+fn test_transform_compress_whitespace_newline() {
+    let test_strs = vec![
+        ("  foo bar",
+         "foo bar"),
+
+        ("foo bar  ",
+         "foo bar "),
+
+        ("foo\n bar",
+         "foo bar"),
+
+        ("foo \nbar",
+         "foo bar"),
+
+        ("  foo  bar  \nbaz",
+         "foo bar baz"),
+
+        ("foo bar baz",
+         "foo bar baz"),
+
+        ("foobarbaz\n\n",
+         "foobarbaz "),
+    ];
+
+    let mode = CompressionMode::CompressWhitespaceNewline;
+    for &(test, oracle) in test_strs.iter() {
+        let mut new_line_pos = vec![];
+        let mut trimmed_str = String::new();
+        transform_text(test, mode, true, &mut trimmed_str, &mut new_line_pos);
+        assert_eq!(&*trimmed_str, oracle)
+    }
+}
+
+#[test]
+fn test_transform_compress_whitespace_newline_no_incoming() {
+    let test_strs = [
+        ("  foo bar",
+         " foo bar"),
+
+        ("\nfoo bar",
+         " foo bar"),
+
+        ("foo bar  ",
+         "foo bar "),
+
+        ("foo\n bar",
+         "foo bar"),
+
+        ("foo \nbar",
+         "foo bar"),
+
+        ("  foo  bar  \nbaz",
+         " foo bar baz"),
+
+        ("foo bar baz",
+         "foo bar baz"),
+
+        ("foobarbaz\n\n",
+         "foobarbaz "),
+    ];
+
+    let mode = CompressionMode::CompressWhitespaceNewline;
+    for &(test, oracle) in test_strs.iter() {
+        let mut new_line_pos = vec![];
+        let mut trimmed_str = String::new();
+        transform_text(test, mode, false, &mut trimmed_str, &mut new_line_pos);
+        assert_eq!(trimmed_str, oracle)
+    }
+}
diff --git a/tests/unit/lib.rs b/tests/unit/lib.rs
index 506b8bf9236..8efc6cc894b 100644
--- a/tests/unit/lib.rs
+++ b/tests/unit/lib.rs
@@ -1,4 +1,6 @@
 extern crate geom;
+extern crate gfx;
 extern crate util;
 
 #[cfg(test)] #[path="util/mod.rs"] mod util_tests;
+#[cfg(test)] #[path="gfx/mod.rs"] mod gfx_tests;