diff --git a/phpunit.xml b/phpunit.xml
index 29bfdba5..b868096c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -16,7 +16,8 @@
         <whitelist>
             <directory>./include/</directory>
             <directory>./public/</directory>
-        </whitelist>
+						<directory>./src/</directory>
+				</whitelist>
     </filter>
     <php>
         <const name="PHPUNIT_TESTSUITE" value="true"/>
diff --git a/test/model/LogEntriesModelTest.php b/test/model/LogEntriesModelTest.php
index 4da6fd4b..25d46fc4 100644
--- a/test/model/LogEntriesModelTest.php
+++ b/test/model/LogEntriesModelTest.php
@@ -1,9 +1,11 @@
 <?php
-
 namespace Engelsystem\Test;
 
-class LogEntriesModelTest extends \PHPUnit_Framework_TestCase
+use \PHPUnit\Framework\TestCase;
+
+class LogEntriesModelTest extends TestCase
 {
+
     public function create_LogEntry()
     {
         LogEntry_create('test', 'test');
@@ -13,7 +15,7 @@ class LogEntriesModelTest extends \PHPUnit_Framework_TestCase
     {
         $count = count(LogEntries());
         $this->assertNotFalse(LogEntry_create('test', 'test_LogEntry_create'));
-
+        
         // There should be one more log entry now
         $this->assertEquals(count(LogEntries()), $count + 1);
     }
diff --git a/test/model/RoomModelTest.php b/test/model/RoomModelTest.php
index 9c91939d..135a6108 100644
--- a/test/model/RoomModelTest.php
+++ b/test/model/RoomModelTest.php
@@ -1,9 +1,11 @@
 <?php
-
 namespace Engelsystem\Test;
 
-class RoomModelTest extends \PHPUnit_Framework_TestCase
+use \PHPUnit\Framework\TestCase;
+
+class RoomModelTest extends TestCase
 {
+
     private $room_id = null;
 
     public function create_Room()
@@ -14,14 +16,14 @@ class RoomModelTest extends \PHPUnit_Framework_TestCase
     public function test_Room()
     {
         $this->create_Room();
-
+        
         $room = Room($this->room_id);
-
+        
         $this->assertNotFalse($room);
         $this->assertNotNull($room);
         $this->assertEquals($room['Name'], 'test');
-
-        $this->assertNull(Room(-1));
+        
+        $this->assertNull(Room(- 1));
     }
 
     /**