diff --git a/composer.json b/composer.json
index 4af0be7..95d364e 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
     "bitexpert/slf4psrlog": "^0.1.3"
   },
   "require-dev": {
-    "phpunit/php-code-coverage": "^4.0.1",
-    "phpunit/phpunit": "^5.6",
+    "phpunit/php-code-coverage": "^5.0.0",
+    "phpunit/phpunit": "^6.0",
     "squizlabs/php_codesniffer": "^2.6.2",
     "phpdocumentor/phpdocumentor": "v2.9.0",
     "monolog/monolog": "^1.21.0",
diff --git a/composer.lock b/composer.lock
index 3de5a4c..c4fbf40 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "2170dd53c763b47d6de6a49147a9af67",
+    "content-hash": "1fd19fa0a44783fbe9f435855603edc5",
     "packages": [
         {
             "name": "bitexpert/slf4psrlog",
@@ -716,18 +716,21 @@
         },
         {
             "name": "container-interop/container-interop",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/container-interop/container-interop.git",
-                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e"
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
-                "reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
                 "shasum": ""
             },
+            "require": {
+                "psr/container": "^1.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -739,7 +742,8 @@
                 "MIT"
             ],
             "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
-            "time": "2014-12-30T15:22:37+00:00"
+            "homepage": "https://github.com/container-interop/container-interop",
+            "time": "2017-02-14T19:40:03+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -1044,16 +1048,16 @@
         },
         {
             "name": "jms/serializer",
-            "version": "1.4.2",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b"
+                "reference": "9dc44f2924a90bf526a2e1c4bb1ce9d772a00a45"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/f39d8b4660d5cef43b0c3265ce642173d9b2c58b",
-                "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/9dc44f2924a90bf526a2e1c4bb1ce9d772a00a45",
+                "reference": "9dc44f2924a90bf526a2e1c4bb1ce9d772a00a45",
                 "shasum": ""
             },
             "require": {
@@ -1075,11 +1079,12 @@
                 "jackalope/jackalope-doctrine-dbal": "^1.1.5",
                 "phpunit/phpunit": "^4.8|^5.0",
                 "propel/propel1": "~1.7",
+                "symfony/expression-language": "^2.6|^3.0",
                 "symfony/filesystem": "^2.1",
-                "symfony/form": "~2.1",
-                "symfony/translation": "^2.1",
-                "symfony/validator": "^2.2",
-                "symfony/yaml": "^2.1",
+                "symfony/form": "~2.1|^3.0",
+                "symfony/translation": "^2.1|^3.0",
+                "symfony/validator": "^2.2|^3.0",
+                "symfony/yaml": "^2.1|^3.0",
                 "twig/twig": "~1.12|~2.0"
             },
             "suggest": {
@@ -1088,7 +1093,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -1115,7 +1120,7 @@
                 "serialization",
                 "xml"
             ],
-            "time": "2016-11-13T10:20:11+00:00"
+            "time": "2017-02-14T14:35:22+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -2199,40 +2204,39 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "4.0.5",
+            "version": "5.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971"
+                "reference": "e7d7a4acca58e45bdfd00221563d131cfb04ba96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c19cfc7cbb0e9338d8c469c7eedecc2a428b0971",
-                "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/e7d7a4acca58e45bdfd00221563d131cfb04ba96",
+                "reference": "e7d7a4acca58e45bdfd00221563d131cfb04ba96",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
+                "php": "^7.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
                 "phpunit/php-token-stream": "^1.4.2",
-                "sebastian/code-unit-reverse-lookup": "~1.0",
-                "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "~1.0|~2.0"
+                "sebastian/code-unit-reverse-lookup": "^1.0",
+                "sebastian/environment": "^2.0",
+                "sebastian/version": "^2.0"
             },
             "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "^5.4"
+                "ext-xdebug": "^2.5",
+                "phpunit/phpunit": "^6.0"
             },
             "suggest": {
                 "ext-dom": "*",
-                "ext-xdebug": ">=2.4.0",
                 "ext-xmlwriter": "*"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.0.x-dev"
+                    "dev-master": "5.0.x-dev"
                 }
             },
             "autoload": {
@@ -2258,7 +2262,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-01-20T15:06:43+00:00"
+            "time": "2017-02-02T10:35:41+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2443,16 +2447,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.7.13",
+            "version": "6.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34"
+                "reference": "e702506af102d0dc5312dd24b8e97fd6e58ce3ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
-                "reference": "60ebeed87a35ea46fd7f7d8029df2d6f013ebb34",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e702506af102d0dc5312dd24b8e97fd6e58ce3ba",
+                "reference": "e702506af102d0dc5312dd24b8e97fd6e58ce3ba",
                 "shasum": ""
             },
             "require": {
@@ -2461,33 +2465,33 @@
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
+                "myclabs/deep-copy": "^1.3",
+                "php": "^7.0",
                 "phpspec/prophecy": "^1.6.2",
-                "phpunit/php-code-coverage": "^4.0.4",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-code-coverage": "^5.0",
+                "phpunit/php-file-iterator": "^1.4",
+                "phpunit/php-text-template": "^1.2",
                 "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
+                "phpunit/phpunit-mock-objects": "^4.0",
                 "sebastian/comparator": "^1.2.4",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "^1.3.4 || ^2.0",
-                "sebastian/exporter": "~2.0",
+                "sebastian/diff": "^1.2",
+                "sebastian/environment": "^2.0",
+                "sebastian/exporter": "^2.0",
                 "sebastian/global-state": "^1.1",
-                "sebastian/object-enumerator": "~2.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0|~2.0",
-                "symfony/yaml": "~2.1|~3.0"
+                "sebastian/object-enumerator": "^2.0",
+                "sebastian/resource-operations": "^1.0",
+                "sebastian/version": "^2.0"
             },
             "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2"
+                "phpdocumentor/reflection-docblock": "3.0.2",
+                "phpunit/dbunit": "<3.0"
             },
             "require-dev": {
                 "ext-pdo": "*"
             },
             "suggest": {
                 "ext-xdebug": "*",
-                "phpunit/php-invoker": "~1.1"
+                "phpunit/php-invoker": "^1.1"
             },
             "bin": [
                 "phpunit"
@@ -2495,7 +2499,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.7.x-dev"
+                    "dev-master": "6.0.x-dev"
                 }
             },
             "autoload": {
@@ -2521,33 +2525,33 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-02-10T09:05:10+00:00"
+            "time": "2017-02-08T05:57:26+00:00"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.3",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+                "reference": "3819745c44f3aff9518fd655f320c4535d541af7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3819745c44f3aff9518fd655f320c4535d541af7",
+                "reference": "3819745c44f3aff9518fd655f320c4535d541af7",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
+                "php": "^7.0",
                 "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2 || ^2.0"
+                "sebastian/exporter": "^2.0"
             },
             "conflict": {
-                "phpunit/phpunit": "<5.4.0"
+                "phpunit/phpunit": "<6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.4"
+                "phpunit/phpunit": "^6.0"
             },
             "suggest": {
                 "ext-soap": "*"
@@ -2555,7 +2559,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2.x-dev"
+                    "dev-master": "4.0.x-dev"
                 }
             },
             "autoload": {
@@ -2580,7 +2584,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2016-12-08T20:27:08+00:00"
+            "time": "2017-02-02T10:36:38+00:00"
         },
         {
             "name": "pimple/pimple",
diff --git a/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php b/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php
index 17da8f5..4decb0a 100644
--- a/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php
+++ b/tests/bitExpert/Disco/AnnotationBeanFactoryUnitTest.php
@@ -25,6 +25,7 @@
 use bitExpert\Disco\Helper\BeanFactoryAwareService;
 use bitExpert\Disco\Helper\MasterService;
 use bitExpert\Disco\Helper\SampleService;
+use PHPUnit\Framework\TestCase;
 use ProxyManager\Proxy\ValueHolderInterface;
 use ProxyManager\Proxy\VirtualProxyInterface;
 use stdClass;
@@ -32,7 +33,7 @@
 /**
  * Unit tests for {@link \bitExpert\Disco\AnnotationBeanFactory}.
  */
-class AnnotationBeanFactoryUnitTest extends \PHPUnit_Framework_TestCase
+class AnnotationBeanFactoryUnitTest extends TestCase
 {
     /**
      * @var AnnotationBeanFactory
diff --git a/tests/bitExpert/Disco/Annotations/AnnotationAttributeParserUnitTest.php b/tests/bitExpert/Disco/Annotations/AnnotationAttributeParserUnitTest.php
index 5b92719..403664f 100644
--- a/tests/bitExpert/Disco/Annotations/AnnotationAttributeParserUnitTest.php
+++ b/tests/bitExpert/Disco/Annotations/AnnotationAttributeParserUnitTest.php
@@ -12,10 +12,12 @@
 
 namespace bitExpert\Disco\Annotations;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Unit tests for {@link \bitExpert\Disco\Annotations\AnnotationsAttributeParser}.
  */
-class AnnotationAttributeParserUnitTest extends \PHPUnit_Framework_TestCase
+class AnnotationAttributeParserUnitTest extends TestCase
 {
     /**
      * @test
@@ -23,7 +25,6 @@ class AnnotationAttributeParserUnitTest extends \PHPUnit_Framework_TestCase
      */
     public function requireGetsRecognizedCorrectly($parameterValue, $expectedValue)
     {
-
         self::assertSame($expectedValue, AnnotationAttributeParser::parseBooleanValue($parameterValue));
     }
 
diff --git a/tests/bitExpert/Disco/Annotations/BeanUnitTest.php b/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
index 01e7c7f..eafc7c9 100644
--- a/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
+++ b/tests/bitExpert/Disco/Annotations/BeanUnitTest.php
@@ -12,10 +12,12 @@
 
 namespace bitExpert\Disco\Annotations;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Unit tests for {@link \bitExpert\Disco\Annotations\Bean}.
  */
-class BeanUnitTest extends \PHPUnit_Framework_TestCase
+class BeanUnitTest extends TestCase
 {
     /**
      * @test
diff --git a/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php b/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
index 01a82fc..9b0efb3 100644
--- a/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
+++ b/tests/bitExpert/Disco/Annotations/ParameterUnitTest.php
@@ -12,10 +12,12 @@
 
 namespace bitExpert\Disco\Annotations;
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Unit tests for {@link \bitExpert\Disco\Annotations\Parameter}.
  */
-class ParameterUnitTest extends \PHPUnit_Framework_TestCase
+class ParameterUnitTest extends TestCase
 {
     /**
      * @test
@@ -23,7 +25,7 @@ class ParameterUnitTest extends \PHPUnit_Framework_TestCase
      */
     public function missingNameWillThrowAnnotationException()
     {
-        $parameter = new Parameter();
+        new Parameter();
     }
 
     /**
diff --git a/tests/bitExpert/Disco/BeanFactoryConfigurationUnitTest.php b/tests/bitExpert/Disco/BeanFactoryConfigurationUnitTest.php
index aa3ed4a..4d75e40 100644
--- a/tests/bitExpert/Disco/BeanFactoryConfigurationUnitTest.php
+++ b/tests/bitExpert/Disco/BeanFactoryConfigurationUnitTest.php
@@ -15,6 +15,7 @@
 use bitExpert\Disco\Store\SerializableBeanStore;
 use Doctrine\Common\Cache\FilesystemCache;
 use Doctrine\Common\Cache\VoidCache;
+use PHPUnit\Framework\TestCase;
 use ProxyManager\Autoloader\Autoloader;
 use ProxyManager\Autoloader\AutoloaderInterface;
 use ProxyManager\FileLocator\FileLocator;
@@ -24,7 +25,7 @@
 /**
  * Unit tests for {@link \bitExpert\Disco\BeanFactoryConfiguration}.
  */
-class BeanFactoryConfigurationUnitTest extends \PHPUnit_Framework_TestCase
+class BeanFactoryConfigurationUnitTest extends TestCase
 {
     /**
      * @test
diff --git a/tests/bitExpert/Disco/BeanFactoryPostProcessorUnitTest.php b/tests/bitExpert/Disco/BeanFactoryPostProcessorUnitTest.php
index 32b1e41..6a52c55 100644
--- a/tests/bitExpert/Disco/BeanFactoryPostProcessorUnitTest.php
+++ b/tests/bitExpert/Disco/BeanFactoryPostProcessorUnitTest.php
@@ -13,12 +13,13 @@
 namespace bitExpert\Disco;
 
 use bitExpert\Disco\Helper\BeanFactoryAwareService;
+use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 
 /**
  * Unit tests for {@link \bitExpert\Disco\BeanFactoryPostProcessor}.
  */
-class BeanFactoryPostProcessorUnitTest extends \PHPUnit_Framework_TestCase
+class BeanFactoryPostProcessorUnitTest extends TestCase
 {
     /**
      * @test
diff --git a/tests/bitExpert/Disco/Proxy/Configuration/ConfigurationGeneratorUnitTest.php b/tests/bitExpert/Disco/Proxy/Configuration/ConfigurationGeneratorUnitTest.php
index fdfe919..da1f47b 100644
--- a/tests/bitExpert/Disco/Proxy/Configuration/ConfigurationGeneratorUnitTest.php
+++ b/tests/bitExpert/Disco/Proxy/Configuration/ConfigurationGeneratorUnitTest.php
@@ -18,18 +18,20 @@
 use bitExpert\Disco\Config\MissingBeanAnnotationConfiguration;
 use bitExpert\Disco\Config\MissingReturnTypeConfiguration;
 use bitExpert\Disco\Config\NonExistentReturnTypeConfiguration;
+use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 use ProxyManager\Generator\ClassGenerator;
 
 /**
  * Unit tests for {@link \bitExpert\Disco\Proxy\Configuration\ConfigurationGenerator}.
  */
-class ConfigurationGeneratorUnitTest extends \PHPUnit_Framework_TestCase
+class ConfigurationGeneratorUnitTest extends TestCase
 {
     /**
      * @var ConfigurationGenerator
      */
     private $configGenerator;
+
     /**
      * @var ClassGenerator|PHPUnit_Framework_MockObject_MockObject
      */
@@ -101,7 +103,7 @@ public function nonExistentClassInReturnTypeThrowsException()
      */
     public function parsingConfigurationWithoutAnyErrorsSucceeds()
     {
-        $this->classGenerator->expects(static::any())
+        $this->classGenerator->expects(self::atLeastOnce())
             ->method('addMethodFromGenerator');
 
         $reflClass = new \ReflectionClass(BeanConfiguration::class);
diff --git a/tests/bitExpert/Disco/Store/SerializableBeanStoreUnitTest.php b/tests/bitExpert/Disco/Store/SerializableBeanStoreUnitTest.php
index 7ad91ef..7974243 100644
--- a/tests/bitExpert/Disco/Store/SerializableBeanStoreUnitTest.php
+++ b/tests/bitExpert/Disco/Store/SerializableBeanStoreUnitTest.php
@@ -15,11 +15,12 @@
 use bitExpert\Disco\Helper\MasterService;
 use bitExpert\Disco\Helper\SampleService;
 use Doctrine\Instantiator\Exception\InvalidArgumentException;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Unit tests for {@link \bitExpert\Disco\Store\SerializableBeanStoreUnitTest}.
  */
-class SerializableBeanStoreUnitTest extends \PHPUnit_Framework_TestCase
+class SerializableBeanStoreUnitTest extends TestCase
 {
     /**
      * @var SerializableBeanStore