diff --git a/.travis.yml b/.travis.yml
index 3f769c6..adad5d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,11 @@ php:
  - 5.3
 
 env:
- - DB=MYSQL CORE_RELEASE=3.1
- - DB=PGSQL CORE_RELEASE=3.1
+ - DB=MYSQL CORE_RELEASE=3
+ - DB=PGSQL CORE_RELEASE=3
 
 matrix:
   include:
-    - php: 5.4
-      env: DB=MYSQL CORE_RELEASE=3
     - php: 5.4
       env: DB=MYSQL CORE_RELEASE=master
 
diff --git a/composer.json b/composer.json
index 9985bfa..e59ee91 100644
--- a/composer.json
+++ b/composer.json
@@ -10,8 +10,8 @@
 		}
 	],
 	"require": {
-		"silverstripe/framework": "~3.2",
-		"silverstripe/cms": "~3.2"
+		"silverstripe/framework": "~3.2,~4.0",
+		"silverstripe/cms": "~3.2,~4.0"
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"