diff --git a/.gitignore b/.gitignore
index bc1f265..f0c7032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
 composer.lock
 /bin/*
-!/bin/.gitkeep
\ No newline at end of file
+!/bin/.gitkeep
+*.cache
diff --git a/.travis.yml b/.travis.yml
index 23db006..f04b8bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,16 @@
 language: php
-dist: trusty
 php:
-  - '5.6'
-  - '7.0'
   - '7.1'
   - '7.2'
-  - 'hhvm'
-os:
-  - linux
+  - '7.3'
+  - '7.4'
+  - 'nightly'
+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 0017b6c..2b3bb38 100644
--- a/composer.json
+++ b/composer.json
@@ -9,16 +9,23 @@
             "email": "jordan@hall05.co.uk"
         }
     ],
-    "require": {},
+    "require": {
+        "php": ">=7.1"
+    },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "satooshi/php-coveralls": "^2.0"
+        "phpunit/phpunit": "^7.0 || ^8.0",
+        "php-coveralls/php-coveralls": "^2.0"
     },
     "autoload": {
         "psr-4": {
             "DivineOmega\\HCLParser\\": "./src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "DivineOmega\\HCLParser\\HCLParser\\Tests\\": "./tests/Unit/"
+        }
+    },
     "scripts": {
         "post-autoload-dump": [
             "DivineOmega\\HCLParser\\Installer::installBinaries"
diff --git a/tests/Unit/BasicUsageTest.php b/tests/Unit/BasicUsageTest.php
index d50148c..ab1fbee 100644
--- a/tests/Unit/BasicUsageTest.php
+++ b/tests/Unit/BasicUsageTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace DivineOmega\HCLParser\HCLParser\Tests;
+
 use DivineOmega\HCLParser\HCLParser;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/InstallerTest.php b/tests/Unit/InstallerTest.php
index c8610bc..8335c80 100644
--- a/tests/Unit/InstallerTest.php
+++ b/tests/Unit/InstallerTest.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace DivineOmega\HCLParser\HCLParser\Tests;
+
 use DivineOmega\HCLParser\Installer;
 use PHPUnit\Framework\TestCase;