diff --git a/.travis.yml b/.travis.yml
index 4876cc7..8b1f8e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,6 @@ matrix:
       env: DB=PGSQL
     - php: 7.0
       env: COVERAGE=1
-    - php: 5.6
   allow_failures:
     - php: 7.0
       env: DB=SQLITE
diff --git a/composer.json b/composer.json
index 88d4372..1baff3f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,9 +18,11 @@
         "composer/installers": "*",
         "silverstripe/framework": "^4.0",
         "silverstripe/cms": "^4.0",
-        "symbiote/silverstripe-gridfieldextensions": "3.0.x-dev",
-        "symbiote/silverstripe-multivaluefield": "4.x-dev",
-        "unclecheese/betterbuttons": "2.x-dev"
+        "symbiote/silverstripe-gridfieldextensions": "^3.0",
+        "symbiote/silverstripe-multivaluefield": "^4.0"
+    },
+    "require-dev": {
+        "phpunit/PHPUnit": "^5.7"
     },
     "suggest": {
         "unisolutions/silverstripe-copybutton": "Duplicate Blocks in Block Admin",
@@ -36,7 +38,8 @@
     },
     "autoload": {
     	"psr-4": {
-    		"SheaDawson\\Blocks\\": "src/"
+    		"SheaDawson\\Blocks\\": "src/",
+            "SheaDawson\\Blocks\\Test\\": "tests/"
     	}
     }
 }