diff --git a/.travis.yml b/.travis.yml
index f7d29ab..25d9a47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,17 @@
 language: php
 dist: trusty
 php:
-  - '5.6'
   - '7.0'
   - '7.1'
+  - '7.2'
+  - nightly
   - 'hhvm'
+matrix:
+  allow_failures:
+    - php: nightly
 install:
-  - composer update
+  - composer install
 script:
  - ./vendor/bin/phpunit --coverage-clover ./tests/Logs/clover.xml
 after_script:
- - php vendor/bin/php-coveralls -v
\ No newline at end of file
+ - php vendor/bin/php-coveralls -v
diff --git a/composer.json b/composer.json
index 6524fb4..fc7417b 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
         "php": ">=5.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^6.5",
         "php-coveralls/php-coveralls": "^2.1"
     },
     "autoload": {
@@ -16,6 +16,11 @@
             "DivineOmega\\DOFileCache\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "DivineOmega\\DOFileCache\\Tests\\": "tests/"
+        }
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "1.0-dev"
diff --git a/phpunit.xml b/phpunit.xml
index a9b8158..0da3f08 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -25,6 +25,6 @@
         </whitelist>
     </filter>
     <php>
-        
+
     </php>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/tests/Functional/CacheStorageAndRetrievalTest.php b/tests/Functional/CacheStorageAndRetrievalTest.php
index 9b47200..46f9f5f 100644
--- a/tests/Functional/CacheStorageAndRetrievalTest.php
+++ b/tests/Functional/CacheStorageAndRetrievalTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace DivineOmega\DOFileCache\Tests;
+
 use PHPUnit\Framework\TestCase;
 
 final class CacheStorageAndRetrievalTest extends TestCase
diff --git a/tests/Unit/BasicTest.php b/tests/Unit/BasicTest.php
index 9064a9f..179b007 100644
--- a/tests/Unit/BasicTest.php
+++ b/tests/Unit/BasicTest.php
@@ -1,8 +1,10 @@
 <?php
 
+namespace DivineOmega\DOFileCache\Tests;
+
 use PHPUnit\Framework\TestCase;
 
-final class BasicTests extends TestCase
+final class BasicTest extends TestCase
 {
     private $cache = null;