diff --git a/.travis.yml b/.travis.yml
index 15534ea3..48b578a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,18 +8,22 @@ env:
   - SYMFONY_VERSION=2.7.*
   - SYMFONY_VERSION=2.8.*
   - SYMFONY_VERSION=3.3.*
-  - SYMFONY_VERSION=dev-master
-
+  - SYMFONY_VERSION=3.3.*
+  - DEPENDENCIES=beta SYMFONY_VERSION=4.0.* STABILITY=beta
 cache:
   directories:
     - $COMPOSER_CACHE_DIR
 
 matrix:
+  exclude:
+    - php: 7.0
+      env: DEPENDENCIES=beta SYMFONY_VERSION=4.0.* STABILITY=beta
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
 
 before_install:
   - composer selfupdate
+  - if [ "$STABILITY" != "" ]; then composer config minimum-stability $STABILITY; fi
 
 before_script:
   - travis_wait composer require symfony/framework-bundle:${SYMFONY_VERSION} --prefer-source
diff --git a/Tests/App/AppKernel.php b/Tests/App/AppKernel.php
index f1aa6f03..b2fc0e79 100644
--- a/Tests/App/AppKernel.php
+++ b/Tests/App/AppKernel.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace Oneup\UploaderBundle\Tests\App;
+
+use Oneup\UploaderBundle\OneupUploaderBundle;
+use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
@@ -8,12 +14,12 @@ class AppKernel extends Kernel
     public function registerBundles()
     {
         $bundles = array(
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
-            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FrameworkBundle(),
+            new SecurityBundle(),
+            new SensioFrameworkExtraBundle(),
 
             // bundle to test
-            new Oneup\UploaderBundle\OneupUploaderBundle(),
+            new OneupUploaderBundle(),
         );
 
         return $bundles;
diff --git a/composer.json b/composer.json
index d68b7793..d03d430e 100644
--- a/composer.json
+++ b/composer.json
@@ -16,29 +16,29 @@
 
     "require": {
         "php":">=5.4",
-        "symfony/framework-bundle": "^2.4|^3.0",
-        "symfony/finder": "^2.4|^3.0",
-        "symfony/translation": "^2.4|^3.0",
-        "symfony/asset": "^2.4|^3.0",
-        "symfony/templating": "^2.4|^3.0",
+        "symfony/framework-bundle": "4.0.*",
+        "symfony/finder": "^2.4|^3.0|^4.0",
+        "symfony/translation": "^2.4|^3.0|^4.0",
+        "symfony/asset": "^2.4|^3.0|^4.0",
+        "symfony/templating": "^2.4|^3.0|^4.0",
         "paragonie/random_compat": "^1.1|^2.0"
     },
 
     "require-dev": {
         "amazonwebservices/aws-sdk-for-php": "1.5.*",
         "knplabs/gaufrette": "0.2.*@dev",
-        "oneup/flysystem-bundle": "^1.2",
-        "phpunit/phpunit": "^4.4",
+        "oneup/flysystem-bundle": "^1.2|^2.0|^3.0",
+        "phpunit/phpunit": "^4.4|^6.5",
         "sensio/framework-extra-bundle": "2.*|^3.0",
-        "symfony/browser-kit": "2.*|^3.0",
-        "symfony/class-loader": "2.*|^3.0",
-        "symfony/security-bundle": "2.*|^3.0",
+        "symfony/browser-kit": "2.*|^3.0|^4.0",
+        "symfony/class-loader": "2.*|^3.0|^4.0",
+        "symfony/security-bundle": "2.*|^3.0|^4.0",
         "twistor/flysystem-stream-wrapper": "^1.0"
     },
 
     "suggest": {
         "knplabs/knp-gaufrette-bundle": "0.1.*",
-        "oneup/flysystem-bundle": "^1.2",
+        "oneup/flysystem-bundle": "^3.0",
         "twistor/flysystem-stream-wrapper": "^1.0 (Required when using Flysystem)"
     },
 
@@ -46,5 +46,6 @@
         "psr-0": { "Oneup\\UploaderBundle": "" }
     },
 
-    "target-dir": "Oneup/UploaderBundle"
+    "target-dir": "Oneup/UploaderBundle",
+    "minimum-stability": "beta"
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7caffb48..28d29f7b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -2,6 +2,7 @@
 
 <phpunit bootstrap="./Tests/bootstrap.php" colors="true">
     <php>
+        <server name="KERNEL_CLASS" value="Oneup\UploaderBundle\Tests\App\AppKernel" />
         <server name="KERNEL_DIR" value="Tests/App" />
     </php>