diff --git a/tests/fieldtypes/TextTest.php b/tests/fieldtypes/TextTest.php
new file mode 100644
index 000000000..73f91c4e0
--- /dev/null
+++ b/tests/fieldtypes/TextTest.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * @package sapphire
+ * @subpackage tests
+ */
+class TextTest extends SapphireTest {
+	
+	/**
+	 * Test {@link Text->LimitWordCount()}
+	 */
+	function testLimitWordCount() {
+		$cases = array(
+			/* Standard words limited, ellipsis added if truncated */
+			'The little brown fox jumped over the lazy cow.' => 'The little brown...',
+		
+			/* Words less than the limt word count don't get truncated, ellipsis not added */
+			'Two words' => 'Two words',	// Two words shouldn't have an ellipsis
+			'One' => 'One',	// Neither should one word
+			'' => '',	// No words produces nothing!
+			
+			/* HTML tags get stripped out, leaving the raw text */
+			'<p>Text inside a paragraph tag should also work</p>' => 'Text inside a...',
+			'<p><span>Text nested inside another tag should also work</span></p>' => 'Text nested inside...'
+		);
+		
+		foreach($cases as $originalValue => $expectedValue) {
+			$textObj = new Text('Test');
+			$textObj->setValue($originalValue);
+			$this->assertEquals($expectedValue, $textObj->LimitWordCount(3));
+		}
+	}
+
+	/**
+	 * Test {@link Text->LimitWordCountXML()}
+	 */
+	/*function testLimitWordCountXML() {
+		$cases = array(
+			// @todo add cases to test by
+		);
+		
+		foreach($cases as $originalValue => $expectedValue) {
+			$textObj = new Text('Test');
+			$textObj->setValue($originalValue);
+			$this->assertEquals($expectedValue, $textObj->LimitWordCountXML(3));
+		}
+	}*/
+	
+}
+?>
\ No newline at end of file