Merged with latest commit
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..aca7809
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit 
+	bootstrap="tests/Bootstrap.php"
+	colors="true"
+	convertNoticesToExceptions="true"
+	convertWarningsToExceptions="true"
+	stopOnError="false"
+	stopOnFailure="false"
+	stopOnIncomplete="false"
+	stopOnSkipped="false">
+	<testsuites>
+		<testsuite name="CodeIgniter Core Test Suite">
+			<file>tests/codeigniter/Setup_test.php</file>
+			<directory suffix="test.php">tests/codeigniter/core</directory>
+			<directory suffix="test.php">tests/codeigniter/helpers</directory>
+			<directory suffix="test.php">tests/codeigniter/libraries</directory>
+			<!-- We'll worry about these later ...
+			<directory suffix="test.php">codeigniter/libraries</directory>
+			<directory suffix="test.php">codeigniter/helpers</directory>
+			-->
+			
+		</testsuite>
+	</testsuites>
+</phpunit>
\ No newline at end of file