diff --git a/swt/src/test/java/edu/umd/cs/piccolox/swt/PSWTTextTest.java b/swt/src/test/java/edu/umd/cs/piccolox/swt/PSWTTextTest.java
index 3e762ef..7b11c65 100644
--- a/swt/src/test/java/edu/umd/cs/piccolox/swt/PSWTTextTest.java
+++ b/swt/src/test/java/edu/umd/cs/piccolox/swt/PSWTTextTest.java
@@ -2,17 +2,22 @@
 
 import junit.framework.TestCase;
 
-public class PSWTTextTest extends TestCase {
+public class PSWTTextTest extends SWTTest {	
     private PSWTText testNode;
 
-    public void setUp() {
-        //testNode = new PSWTText();
+    public void setUp() {    	
+    	if (isHeadless()) 
+    		return;
+    	
+        testNode = new PSWTText();
     }
 
     public void testTextPersistsTrainingAndInternalNewlines() {
-        // TODO: Make this work in headless mode if possible.
-        // testNode.setText("Hello\nWorld\n\n");
-        // assertEquals("Hello\nWorld\n\n", testNode.getText());
+    	if (isHeadless())
+    		return;
+
+        testNode.setText("Hello\nWorld\n\n");
+        assertEquals("Hello\nWorld\n\n", testNode.getText());
     }
 
 }
diff --git a/swt/src/test/java/edu/umd/cs/piccolox/swt/SWTTest.java b/swt/src/test/java/edu/umd/cs/piccolox/swt/SWTTest.java
new file mode 100644
index 0000000..a07f57a
--- /dev/null
+++ b/swt/src/test/java/edu/umd/cs/piccolox/swt/SWTTest.java
@@ -0,0 +1,11 @@
+package edu.umd.cs.piccolox.swt;
+
+import java.awt.GraphicsEnvironment;
+
+import junit.framework.TestCase;
+
+public abstract class SWTTest extends TestCase {
+	public final boolean isHeadless() {
+		return GraphicsEnvironment.isHeadless();
+	}
+}