diff --git a/Cargo.lock b/Cargo.lock
index cdd4c1f1f46..cd08ec8f173 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1101,16 +1101,6 @@ dependencies = [
  "xml5ever 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "gfx_tests"
-version = "0.0.1"
-dependencies = [
- "cssparser 0.23.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "gfx 0.0.1",
- "ipc-channel 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "style 0.0.1",
-]
-
 [[package]]
 name = "gfx_traits"
 version = "0.0.1"
diff --git a/components/gfx/Cargo.toml b/components/gfx/Cargo.toml
index c9220a2c080..5eea73f321f 100644
--- a/components/gfx/Cargo.toml
+++ b/components/gfx/Cargo.toml
@@ -9,6 +9,8 @@ publish = false
 [lib]
 name = "gfx"
 path = "lib.rs"
+test = false
+doctest = false
 
 [features]
 unstable = ["simd"]
diff --git a/tests/unit/gfx/text_util.rs b/components/gfx/tests/text_util.rs
similarity index 99%
rename from tests/unit/gfx/text_util.rs
rename to components/gfx/tests/text_util.rs
index f0253179145..7729a6f78a7 100644
--- a/tests/unit/gfx/text_util.rs
+++ b/components/gfx/tests/text_util.rs
@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+extern crate gfx;
+
 use gfx::text::util::{CompressionMode, transform_text};
 
 #[test]
diff --git a/components/gfx/text/glyph.rs b/components/gfx/text/glyph.rs
index e765f48ee20..0c3386aca7d 100644
--- a/components/gfx/text/glyph.rs
+++ b/components/gfx/text/glyph.rs
@@ -392,7 +392,7 @@ impl<'a> GlyphInfo<'a> {
 /// Simple glyphs are stored inline in the `entry_buffer`, detailed glyphs are
 /// stored as pointers into the `detail_store`.
 ///
-/// ~~~ignore
+/// ~~~ascii
 /// +- GlyphStore --------------------------------+
 /// |               +---+---+---+---+---+---+---+ |
 /// | entry_buffer: |   | s |   | s |   | s | s | |  d = detailed
diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py
index dfe78c0f36b..21ff295ac11 100644
--- a/python/servo/testing_commands.py
+++ b/python/servo/testing_commands.py
@@ -231,7 +231,7 @@ class MachCommands(CommandBase):
             else:
                 test_patterns.append(test)
 
-        self_contained_tests = ["msg", "selectors"]
+        self_contained_tests = ["gfx", "msg", "selectors"]
         if not packages:
             packages = set(os.listdir(path.join(self.context.topdir, "tests", "unit"))) - set(['.DS_Store'])
             packages |= set(self_contained_tests)
diff --git a/tests/unit/gfx/Cargo.toml b/tests/unit/gfx/Cargo.toml
deleted file mode 100644
index 46495840ce0..00000000000
--- a/tests/unit/gfx/Cargo.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[package]
-name = "gfx_tests"
-version = "0.0.1"
-authors = ["The Servo Project Developers"]
-license = "MPL-2.0"
-
-[lib]
-name = "gfx_tests"
-path = "lib.rs"
-doctest = false
-
-[dependencies]
-cssparser = "0.23.0"
-gfx = {path = "../../../components/gfx"}
-ipc-channel = "0.9"
-style = {path = "../../../components/style"}
diff --git a/tests/unit/gfx/lib.rs b/tests/unit/gfx/lib.rs
deleted file mode 100644
index a8120a50138..00000000000
--- a/tests/unit/gfx/lib.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#![cfg(test)]
-
-extern crate gfx;
-
-mod text_util;