diff --git a/.travis.yml b/.travis.yml
index f6eefa5..203f6db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,14 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
+  - nightly
   - hhvm
 
 matrix:
   fast_finish: true
   allow_failures:
+    - php: nightly
     - php: hhvm
 
 before_install:
@@ -25,7 +28,7 @@ before_install:
         echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
     fi
   # Remove PHP CS Fixer for PHP 5.5 since it requires PHP 5.6
-  - if [[ $TRAVIS_PHP_VERSION == "5.5" || $TRAVIS_PHP_VERSION == "hhvm" ]]; then composer remove friendsofphp/php-cs-fixer --dev --no-update; fi
+  - if [[ $TRAVIS_PHP_VERSION == "5.5" || $TRAVIS_PHP_VERSION == "nightly"  || $TRAVIS_PHP_VERSION == "hhvm" ]]; then composer remove friendsofphp/php-cs-fixer --dev --no-update; fi
 
 before_script:
   - composer self-update || true
@@ -37,7 +40,7 @@ script:
   # PHP CodeSniffer
   - vendor/bin/phpcs -p --report=summary
   # PHP CS Fixer (if >=5.6)
-  - if [[ $TRAVIS_PHP_VERSION != "5.5" && $TRAVIS_PHP_VERSION != "hhvm" ]]; then vendor/bin/php-cs-fixer fix --dry-run; fi
+  - if [[ $TRAVIS_PHP_VERSION != "5.5" && $TRAVIS_PHP_VERSION != "nightly" && $TRAVIS_PHP_VERSION != "hhvm" ]]; then vendor/bin/php-cs-fixer fix --dry-run; fi
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/composer.json b/composer.json
index 686c444..064215e 100644
--- a/composer.json
+++ b/composer.json
@@ -23,12 +23,13 @@
     "require-dev": {
         "bolt/codingstyle": "^2.0@dev",
         "bolt/filesystem": "^2.0",
-        "escapestudios/symfony2-coding-standard": "^3.0@dev",
-        "friendsofphp/php-cs-fixer": "^2.4",
+        "escapestudios/symfony2-coding-standard": "^3.1",
+        "friendsofphp/php-cs-fixer": "^2.10",
         "mikey179/vfsstream": "^1.6",
-        "phpunit/phpunit": "^4.8",
+        "phpunit/phpunit": "^4.8 || ^5.7 || ^6.0",
         "predis/predis": "^1.1",
         "silex/silex": "^1.3 || ^2.0",
+        "squizlabs/php_codesniffer": "^3.0",
         "symfony/cache": "^3.3 || ^4.0",
         "symfony/filesystem": "^2.8 || ^3.0 || ^4.0",
         "symfony/phpunit-bridge": "^3.3 || ^4.0"
@@ -44,15 +45,10 @@
         }
     },
     "scripts": {
-        "test": "phpunit",
+        "test": "vendor/bin/phpunit",
         "lint": [
-            "phpcbf",
-            "php-cs-fixer fix"
+            "vendor/bin/phpcbf",
+            "vendor/bin/php-cs-fixer fix"
         ]
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.x-dev"
-        }
     }
 }
diff --git a/tests/Handler/Factory/MemcacheFactoryTest.php b/tests/Handler/Factory/MemcacheFactoryTest.php
index 825bdf7..056746b 100644
--- a/tests/Handler/Factory/MemcacheFactoryTest.php
+++ b/tests/Handler/Factory/MemcacheFactoryTest.php
@@ -5,7 +5,7 @@
 use Bolt\Session\Handler\Factory\MemcacheFactory;
 use Bolt\Session\OptionsBag;
 use Bolt\Session\Tests\Handler\Factory\Mock\MockMemcache;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * @requires extension memcache
diff --git a/tests/Handler/Factory/Mock/MockMemcached.php b/tests/Handler/Factory/Mock/MockMemcached.php
index f6d8077..c412b52 100644
--- a/tests/Handler/Factory/Mock/MockMemcached.php
+++ b/tests/Handler/Factory/Mock/MockMemcached.php
@@ -48,7 +48,7 @@ public function setOption($option, $value)
         $this->options[$value];
     }
 
-    public function setOptions(/* @noinspection PhpSignatureMismatchDuringInheritanceInspection */ $options)
+    public function setOptions($options)
     {
         $this->options = $options;
     }
diff --git a/tests/IniBagTest.php b/tests/IniBagTest.php
index 0d9837c..1765829 100644
--- a/tests/IniBagTest.php
+++ b/tests/IniBagTest.php
@@ -132,6 +132,9 @@ public function testHas()
         $this->assertFalse($ini->has('kajhsdfakjsdfh'));
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testSet()
     {
         $ini = new IniBag('session');
@@ -146,6 +149,9 @@ public function testSet()
         }
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testAdd()
     {
         $ini = new IniBag('session');
@@ -160,6 +166,9 @@ public function testAdd()
         }
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testReplace()
     {
         $ini = new IniBag('session');