diff --git a/dev/TestListener.php b/dev/TestListener.php
new file mode 100644
index 000000000..e6bb43d1f
--- /dev/null
+++ b/dev/TestListener.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Necessary to call setUpOnce() and tearDownOnce() on {@link SapphireTest}
+ * classes. This feature doesn't exist in PHPUnit in the same way
+ * (setUpBeforeClass() and tearDownAfterClass() are just called statically).
+ * 
+ * @see http://www.phpunit.de/manual/3.5/en/extending-phpunit.html#extending-phpunit.PHPUnit_Framework_TestListener
+ * 
+ * @package sapphire
+ * @subpackage testing
+ */
+class SS_TestListener implements PHPUnit_Framework_TestListener {
+	
+	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+  public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {}
+
+  public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+  public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {}
+
+  public function startTest(PHPUnit_Framework_Test $test) {}
+
+  public function endTest(PHPUnit_Framework_Test $test, $time) {}
+	
+	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
+		$name = $suite->getName();
+		if(!$this->isValidClass($name)) return;
+		
+		$this->class = new $name();
+		$this->class->setUpOnce();
+  }
+
+	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
+		$name = $suite->getName();
+		if(!$this->isValidClass($name)) return;
+		
+		$this->class->tearDownOnce();
+	}
+	
+	/**
+	 * @param String Classname
+	 * @return boolean
+	 */
+	protected function isValidClass($name) {
+		return (class_exists($name) && is_subclass_of($name, 'SapphireTest'));
+	}
+}
\ No newline at end of file
diff --git a/dev/TestRunner.php b/dev/TestRunner.php
index bbb103a89..7d0c4297b 100644
--- a/dev/TestRunner.php
+++ b/dev/TestRunner.php
@@ -6,6 +6,10 @@
 
 /**
  * Controller that executes PHPUnit tests.
+ * 
+ * Alternatively, you can also use the "phpunit" binary directly by
+ * pointing it to a file or folder containing unit tests.
+ * See phpunit.dist.xml in the webroot for configuration details.
  *
  * <h2>URL Options</h2>
  * - SkipTests: A comma-separated list of test classes to skip (useful when running dev/tests/all)