diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 00000000..5b6d97a1
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,24 @@
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
+	backupGlobals="false"
+	bootstrap="./includes/engelsystem_provider.php"
+	colors="true"
+	convertErrorsToExceptions="true" 
+	convertNoticesToExceptions="true"
+	convertWarningsToExceptions="true"
+	processIsolation="false">
+	<testsuites>
+		<testsuite name="Models">
+			<directory>./test/model/</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist>
+			<directory>./include/</directory>
+			<directory>./public/</directory>
+		</whitelist>
+	</filter>
+	<php>
+		<const name="PHPUNIT_TESTSUITE" value="true" />
+	</php>
+</phpunit>
diff --git a/test/model/LogEntries_model_test.php b/test/model/LogEntriesModelTest.php
similarity index 90%
rename from test/model/LogEntries_model_test.php
rename to test/model/LogEntriesModelTest.php
index cefc4177..b4cef725 100644
--- a/test/model/LogEntries_model_test.php
+++ b/test/model/LogEntriesModelTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class LogEntries_model_test extends PHPUnit_Framework_TestCase {
+class LogEntriesModelTest extends PHPUnit_Framework_TestCase {
 
   public function create_LogEntry() {
     LogEntry_create('test', 'test');
@@ -29,4 +29,4 @@ class LogEntries_model_test extends PHPUnit_Framework_TestCase {
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/test/model/Room_model_test.php b/test/model/RoomModelTest.php
similarity index 89%
rename from test/model/Room_model_test.php
rename to test/model/RoomModelTest.php
index a36a9d9f..33e6ca37 100644
--- a/test/model/Room_model_test.php
+++ b/test/model/RoomModelTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class Room_model_test extends PHPUnit_Framework_TestCase {
+class RoomModelTest extends PHPUnit_Framework_TestCase {
 
   private $room_id = null;
 
@@ -30,4 +30,4 @@ class Room_model_test extends PHPUnit_Framework_TestCase {
   }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/test/phpunit.xml b/test/phpunit.xml
deleted file mode 100644
index d6007646..00000000
--- a/test/phpunit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
-	bootstrap="../includes/engelsystem_provider.php" colors="true"
-	convertErrorsToExceptions="true" convertNoticesToExceptions="true"
-	convertWarningsToExceptions="true" forceCoversAnnotation="false">
-	<testsuites>
-		<testsuite name="Models">
-			<directory>model/*</directory>
-		</testsuite>
-	</testsuites>
-	<php>
-		<const name="PHPUNIT_TESTSUITE" value="true" />
-	</php>
-</phpunit>