diff --git a/Tests/Entity/MediaTest.php b/Tests/Entity/MediaTest.php
index f1731e4..7289ce3 100644
--- a/Tests/Entity/MediaTest.php
+++ b/Tests/Entity/MediaTest.php
@@ -4,7 +4,7 @@
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Media;
 
-class MediaTest extends \PHPUnit_Framework_TestCase
+class MediaTest extends \PHPUnit\Framework\TestCase
 {
     public function testTweet()
     {
diff --git a/Tests/Entity/TweetTest.php b/Tests/Entity/TweetTest.php
index 72f0d19..7aef287 100644
--- a/Tests/Entity/TweetTest.php
+++ b/Tests/Entity/TweetTest.php
@@ -6,7 +6,7 @@
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\Tweet;
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\User;
 
-class TweetTest extends \PHPUnit_Framework_TestCase
+class TweetTest extends \PHPUnit\Framework\TestCase
 {
     public function testTweet()
     {
diff --git a/Tests/Entity/UserTest.php b/Tests/Entity/UserTest.php
index 6d5c1ce..796401f 100644
--- a/Tests/Entity/UserTest.php
+++ b/Tests/Entity/UserTest.php
@@ -4,7 +4,7 @@
 
 use AlexisLefebvre\Bundle\AsyncTweetsBundle\Entity\User;
 
-class UserTest extends \PHPUnit_Framework_TestCase
+class UserTest extends \PHPUnit\Framework\TestCase
 {
     public function testUser()
     {
diff --git a/Tests/Features/Context/FeatureContext.php b/Tests/Features/Context/FeatureContext.php
index e6fab35..1d7ae6b 100644
--- a/Tests/Features/Context/FeatureContext.php
+++ b/Tests/Features/Context/FeatureContext.php
@@ -40,7 +40,7 @@ public function thereIsATweet()
      */
     public function theTweetMustHaveCorrectId()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             152120320,
             $this->tweet->getId()
         );
@@ -51,7 +51,7 @@ public function theTweetMustHaveCorrectId()
      */
     public function theTweetMustHaveCorrectCreatedAtDate()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             $this->now,
             $this->tweet->getCreatedAt()
         );
@@ -62,7 +62,7 @@ public function theTweetMustHaveCorrectCreatedAtDate()
      */
     public function theTweetMustHaveCorrectText()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             'Hello World!',
             $this->tweet->getText()
         );
@@ -73,7 +73,7 @@ public function theTweetMustHaveCorrectText()
      */
     public function theTweetMustHaveCorrectRetweetCount()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             1999,
             $this->tweet->getRetweetCount()
         );
@@ -84,7 +84,7 @@ public function theTweetMustHaveCorrectRetweetCount()
      */
     public function theTweetMustHaveCorrectFavoriteCount()
     {
-        \PHPUnit_Framework_Assert::assertSame(
+        \PHPUnit\Framework\Assert::assertSame(
             42,
             $this->tweet->getFavoriteCount()
         );
@@ -95,7 +95,7 @@ public function theTweetMustHaveCorrectFavoriteCount()
      */
     public function theTweetMustBeInTimeline()
     {
-        \PHPUnit_Framework_Assert::assertTrue(
+        \PHPUnit\Framework\Assert::assertTrue(
             $this->tweet->isInTimeline()
         );
     }
diff --git a/composer.json b/composer.json
index 3789cfb..ae3ebe6 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
         "symfony/monolog-bundle": "~2.4",
         "doctrine/doctrine-fixtures-bundle": "~2.3",
         "liip/functional-test-bundle": "~1.4",
-        "phpunit/phpunit": "4.8.* || ~5.1",
+        "phpunit/phpunit": "~5.7.21||~6.2",
         "behat/behat": "^3.2",
         "behat/symfony2-extension": "^2.1",
         "behat/mink": "^1.7",