diff --git a/.travis.yml b/.travis.yml
index a5d059210..fa8aa0e72 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,11 @@
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
+  - 8.0
+  - nightly
 
 sudo: false
 
diff --git a/composer.json b/composer.json
index 9d54abc37..01b104735 100644
--- a/composer.json
+++ b/composer.json
@@ -12,11 +12,11 @@
         }
     ],
     "require": {
-        "php": "^5.4|^7.0"
+        "php": "^7.2|^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "mockery/mockery": "~0.8",
+        "phpunit/phpunit": "~8.0 | ~9.2",
+        "mockery/mockery": "~1.3",
         "guzzlehttp/guzzle": "~5.0"
     },
     "suggest": {
diff --git a/tests/Authentication/AccessTokenMetadataTest.php b/tests/Authentication/AccessTokenMetadataTest.php
index 1900492c9..c494fda45 100644
--- a/tests/Authentication/AccessTokenMetadataTest.php
+++ b/tests/Authentication/AccessTokenMetadataTest.php
@@ -24,8 +24,10 @@
 namespace Facebook\Tests\Authentication;
 
 use Facebook\Authentication\AccessTokenMetadata;
+use Facebook\Exceptions\FacebookSDKException;
+use Facebook\Tests\BaseTestCase;
 
-class AccessTokenMetadataTest extends \PHPUnit_Framework_TestCase
+class AccessTokenMetadataTest extends BaseTestCase
 {
 
     protected $graphResponseData = [
@@ -51,7 +53,7 @@ class AccessTokenMetadataTest extends \PHPUnit_Framework_TestCase
         ],
     ];
 
-    public function testDatesGetCastToDateTime()
+    public function testDatesGetCastToDateTime(): void
     {
         $metadata = new AccessTokenMetadata($this->graphResponseData);
 
@@ -62,7 +64,7 @@ public function testDatesGetCastToDateTime()
         $this->assertInstanceOf('DateTime', $issuedAt);
     }
 
-    public function testAllTheGettersReturnTheProperValue()
+    public function testAllTheGettersReturnTheProperValue(): void
     {
         $metadata = new AccessTokenMetadata($this->graphResponseData);
 
@@ -81,56 +83,51 @@ public function testAllTheGettersReturnTheProperValue()
         $this->assertEquals('1337', $metadata->getUserId());
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
-    public function testInvalidMetadataWillThrow()
+    public function testInvalidMetadataWillThrow(): void
     {
+        $this->expectException(FacebookSDKException::class);
         new AccessTokenMetadata(['foo' => 'bar']);
     }
 
-    public function testAnExpectedAppIdWillNotThrow()
+    public function testAnExpectedAppIdWillNotThrow(): void
     {
         $metadata = new AccessTokenMetadata($this->graphResponseData);
         $metadata->validateAppId('123');
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
-    public function testAnUnexpectedAppIdWillThrow()
+    public function testAnUnexpectedAppIdWillThrow(): void
     {
+        $this->expectException(FacebookSDKException::class);
+
         $metadata = new AccessTokenMetadata($this->graphResponseData);
         $metadata->validateAppId('foo');
     }
 
-    public function testAnExpectedUserIdWillNotThrow()
+    public function testAnExpectedUserIdWillNotThrow(): void
     {
         $metadata = new AccessTokenMetadata($this->graphResponseData);
         $metadata->validateUserId('1337');
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
-    public function testAnUnexpectedUserIdWillThrow()
+    public function testAnUnexpectedUserIdWillThrow(): void
     {
+        $this->expectException(FacebookSDKException::class);
+
         $metadata = new AccessTokenMetadata($this->graphResponseData);
         $metadata->validateUserId('foo');
     }
 
-    public function testAnActiveAccessTokenWillNotThrow()
+    public function testAnActiveAccessTokenWillNotThrow(): void
     {
         $this->graphResponseData['data']['expires_at'] = time() + 1000;
         $metadata = new AccessTokenMetadata($this->graphResponseData);
         $metadata->validateExpiration();
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
-    public function testAnExpiredAccessTokenWillThrow()
+    public function testAnExpiredAccessTokenWillThrow(): void
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
+
         $this->graphResponseData['data']['expires_at'] = time() - 1000;
         $metadata = new AccessTokenMetadata($this->graphResponseData);
         $metadata->validateExpiration();
diff --git a/tests/Authentication/AccessTokenTest.php b/tests/Authentication/AccessTokenTest.php
index 39e42d48b..8c24a9b7e 100644
--- a/tests/Authentication/AccessTokenTest.php
+++ b/tests/Authentication/AccessTokenTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\Authentication;
 
 use Facebook\Authentication\AccessToken;
+use Facebook\Tests\BaseTestCase;
 
-class AccessTokenTest extends \PHPUnit_Framework_TestCase
+class AccessTokenTest extends BaseTestCase
 {
 
     public function testAnAccessTokenCanBeReturnedAsAString()
diff --git a/tests/Authentication/OAuth2ClientTest.php b/tests/Authentication/OAuth2ClientTest.php
index 5b144d7b7..cb7ef38e8 100644
--- a/tests/Authentication/OAuth2ClientTest.php
+++ b/tests/Authentication/OAuth2ClientTest.php
@@ -26,8 +26,9 @@
 use Facebook\Facebook;
 use Facebook\FacebookApp;
 use Facebook\Authentication\OAuth2Client;
+use Facebook\Tests\BaseTestCase;
 
-class OAuth2ClientTest extends \PHPUnit_Framework_TestCase
+class OAuth2ClientTest extends BaseTestCase
 {
 
     /**
@@ -45,14 +46,14 @@ class OAuth2ClientTest extends \PHPUnit_Framework_TestCase
      */
     protected $oauth;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_secret');
         $this->client = new FooFacebookClientForOAuth2Test();
         $this->oauth = new OAuth2Client($app, $this->client, static::TESTING_GRAPH_VERSION);
     }
 
-    public function testCanGetMetadataFromAnAccessToken()
+    public function testCanGetMetadataFromAnAccessToken(): void
     {
         $this->client->setMetadataResponse();
 
@@ -74,15 +75,19 @@ public function testCanGetMetadataFromAnAccessToken()
         $this->assertEquals(static::TESTING_GRAPH_VERSION, $request->getGraphVersion());
     }
 
-    public function testCanBuildAuthorizationUrl()
+    public function testCanBuildAuthorizationUrl(): void
     {
         $scope = ['email', 'base_foo'];
         $authUrl = $this->oauth->getAuthorizationUrl('https://foo.bar', 'foo_state', $scope, ['foo' => 'bar'], '*');
 
-        $this->assertContains('*', $authUrl);
+        $this->assertStringContainsString('*', $authUrl);
 
         $expectedUrl = 'https://www.facebook.com/' . static::TESTING_GRAPH_VERSION . '/dialog/oauth?';
-        $this->assertTrue(strpos($authUrl, $expectedUrl) === 0, 'Unexpected base authorization URL returned from getAuthorizationUrl().');
+        $this->assertSame(
+            strpos($authUrl, $expectedUrl),
+            0,
+            'Unexpected base authorization URL returned from getAuthorizationUrl().'
+        );
 
         $params = [
             'client_id' => '123',
@@ -93,11 +98,11 @@ public function testCanBuildAuthorizationUrl()
             'foo' => 'bar',
         ];
         foreach ($params as $key => $value) {
-            $this->assertContains($key . '=' . urlencode($value), $authUrl);
+            $this->assertStringContainsString($key . '=' . urlencode($value), $authUrl);
         }
     }
 
-    public function testCanGetAccessTokenFromCode()
+    public function testCanGetAccessTokenFromCode(): void
     {
         $this->client->setAccessTokenResponse();
 
@@ -122,7 +127,7 @@ public function testCanGetAccessTokenFromCode()
         $this->assertEquals(static::TESTING_GRAPH_VERSION, $request->getGraphVersion());
     }
 
-    public function testCanGetLongLivedAccessToken()
+    public function testCanGetLongLivedAccessToken(): void
     {
         $this->client->setAccessTokenResponse();
 
@@ -143,7 +148,7 @@ public function testCanGetLongLivedAccessToken()
         $this->assertEquals($expectedParams, $request->getParams());
     }
 
-    public function testCanGetCodeFromLongLivedAccessToken()
+    public function testCanGetCodeFromLongLivedAccessToken(): void
     {
         $this->client->setCodeResponse();
 
diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
new file mode 100644
index 000000000..bcf9b94a6
--- /dev/null
+++ b/tests/BaseTestCase.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Facebook\Tests;
+
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class BaseTestCase extends MockeryTestCase
+{
+
+}
diff --git a/tests/Exceptions/FacebookResponseExceptionTest.php b/tests/Exceptions/FacebookResponseExceptionTest.php
index ae18fdec8..e9e56c4a6 100644
--- a/tests/Exceptions/FacebookResponseExceptionTest.php
+++ b/tests/Exceptions/FacebookResponseExceptionTest.php
@@ -27,8 +27,9 @@
 use Facebook\FacebookRequest;
 use Facebook\FacebookResponse;
 use Facebook\Exceptions\FacebookResponseException;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookResponseExceptionTest extends \PHPUnit_Framework_TestCase
+class FacebookResponseExceptionTest extends BaseTestCase
 {
 
     /**
@@ -36,7 +37,7 @@ class FacebookResponseExceptionTest extends \PHPUnit_Framework_TestCase
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->request = new FacebookRequest(new FacebookApp('123', 'foo'));
     }
diff --git a/tests/FacebookAppTest.php b/tests/FacebookAppTest.php
index de0847711..4c862a72c 100644
--- a/tests/FacebookAppTest.php
+++ b/tests/FacebookAppTest.php
@@ -25,14 +25,14 @@
 
 use Facebook\FacebookApp;
 
-class FacebookAppTest extends \PHPUnit_Framework_TestCase
+class FacebookAppTest extends BaseTestCase
 {
     /**
      * @var FacebookApp
      */
     private $app;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->app = new FacebookApp('id', 'secret');
     }
@@ -64,11 +64,9 @@ public function testSerialization()
         $this->assertEquals('secret', $newApp->getSecret());
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testOverflowIntegersWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         new FacebookApp(PHP_INT_MAX + 1, "foo");
     }
 
diff --git a/tests/FacebookBatchRequestTest.php b/tests/FacebookBatchRequestTest.php
index a77e75450..6235c3cdc 100755
--- a/tests/FacebookBatchRequestTest.php
+++ b/tests/FacebookBatchRequestTest.php
@@ -29,14 +29,14 @@
 use Facebook\FacebookBatchRequest;
 use Facebook\FileUpload\FacebookFile;
 
-class FacebookBatchRequestTest extends \PHPUnit_Framework_TestCase
+class FacebookBatchRequestTest extends BaseTestCase
 {
     /**
      * @var FacebookApp
      */
     private $app;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->app = new FacebookApp('123', 'foo_secret');
     }
@@ -80,31 +80,25 @@ public function testRequestWithAppOnlyWillFallbackToBatchDefaults()
         $this->assertRequestContainsAppAndToken($request, $customApp, 'foo_token');
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testWillThrowWhenNoThereIsNoAppFallback()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $batchRequest = new FacebookBatchRequest();
 
         $batchRequest->addFallbackDefaults(new FacebookRequest(null, 'foo_token'));
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testWillThrowWhenNoThereIsNoAccessTokenFallback()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $request = new FacebookBatchRequest();
 
         $request->addFallbackDefaults(new FacebookRequest($this->app));
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testAnInvalidTypeGivenToAddWillThrow()
     {
+        $this->expectException(\InvalidArgumentException::class);
         $request = new FacebookBatchRequest();
 
         $request->add('foo');
@@ -168,21 +162,17 @@ public function testRequestsCanBeInjectedIntoConstructor()
         $this->assertRequestsMatch($requests, $formattedRequests);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAZeroRequestCountWithThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $batchRequest = new FacebookBatchRequest($this->app, [], 'foo_token');
 
         $batchRequest->validateBatchRequestCount();
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testMoreThanFiftyRequestsWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $batchRequest = $this->createBatchRequest();
 
         $this->createAndAppendRequestsTo($batchRequest, 51);
diff --git a/tests/FacebookBatchResponseTest.php b/tests/FacebookBatchResponseTest.php
index 8f4e5a8ad..6625c060f 100755
--- a/tests/FacebookBatchResponseTest.php
+++ b/tests/FacebookBatchResponseTest.php
@@ -29,7 +29,7 @@
 use Facebook\FacebookBatchRequest;
 use Facebook\FacebookBatchResponse;
 
-class FacebookBatchResponseTest extends \PHPUnit_Framework_TestCase
+class FacebookBatchResponseTest extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookApp
@@ -41,7 +41,7 @@ class FacebookBatchResponseTest extends \PHPUnit_Framework_TestCase
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->app = new FacebookApp('123', 'foo_secret');
         $this->request = new FacebookRequest(
diff --git a/tests/FacebookClientTest.php b/tests/FacebookClientTest.php
index 9a08fb6e8..c97a6fdc7 100644
--- a/tests/FacebookClientTest.php
+++ b/tests/FacebookClientTest.php
@@ -32,13 +32,15 @@
 use Facebook\FileUpload\FacebookFile;
 use Facebook\FileUpload\FacebookVideo;
 // These are needed when you uncomment the HTTP clients below.
-use Facebook\HttpClients\FacebookCurlHttpClient;
-use Facebook\HttpClients\FacebookGuzzleHttpClient;
-use Facebook\HttpClients\FacebookStreamHttpClient;
 use Facebook\Tests\Fixtures\MyFooBatchClientHandler;
 use Facebook\Tests\Fixtures\MyFooClientHandler;
+use Facebook\GraphNodes\GraphNode;
+use Facebook\FacebookBatchResponse;
+use Facebook\FacebookResponse;
+use Facebook\HttpClients\FacebookStreamHttpClient;
+use Facebook\HttpClients\FacebookCurlHttpClient;
 
-class FacebookClientTest extends \PHPUnit_Framework_TestCase
+class FacebookClientTest extends BaseTestCase
 {
     /**
      * @var FacebookApp
@@ -60,34 +62,34 @@ class FacebookClientTest extends \PHPUnit_Framework_TestCase
      */
     public static $testFacebookClient;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fbApp = new FacebookApp('id', 'shhhh!');
         $this->fbClient = new FacebookClient(new MyFooClientHandler());
     }
 
-    public function testACustomHttpClientCanBeInjected()
+    public function testACustomHttpClientCanBeInjected(): void
     {
         $handler = new MyFooClientHandler();
         $client = new FacebookClient($handler);
         $httpHandler = $client->getHttpClientHandler();
 
-        $this->assertInstanceOf('Facebook\Tests\Fixtures\MyFooClientHandler', $httpHandler);
+        $this->assertInstanceOf(MyFooClientHandler::class, $httpHandler);
     }
 
-    public function testTheHttpClientWillFallbackToDefault()
+    public function testTheHttpClientWillFallbackToDefault(): void
     {
         $client = new FacebookClient();
         $httpHandler = $client->getHttpClientHandler();
 
         if (function_exists('curl_init')) {
-            $this->assertInstanceOf('Facebook\HttpClients\FacebookCurlHttpClient', $httpHandler);
+            $this->assertInstanceOf(FacebookCurlHttpClient::class, $httpHandler);
         } else {
-            $this->assertInstanceOf('Facebook\HttpClients\FacebookStreamHttpClient', $httpHandler);
+            $this->assertInstanceOf(FacebookStreamHttpClient::class, $httpHandler);
         }
     }
 
-    public function testBetaModeCanBeDisabledOrEnabledViaConstructor()
+    public function testBetaModeCanBeDisabledOrEnabledViaConstructor(): void
     {
         $client = new FacebookClient(null, false);
         $url = $client->getBaseGraphUrl();
@@ -98,7 +100,7 @@ public function testBetaModeCanBeDisabledOrEnabledViaConstructor()
         $this->assertEquals(FacebookClient::BASE_GRAPH_URL_BETA, $url);
     }
 
-    public function testBetaModeCanBeDisabledOrEnabledViaMethod()
+    public function testBetaModeCanBeDisabledOrEnabledViaMethod(): void
     {
         $client = new FacebookClient();
         $client->enableBetaMode(false);
@@ -110,7 +112,7 @@ public function testBetaModeCanBeDisabledOrEnabledViaMethod()
         $this->assertEquals(FacebookClient::BASE_GRAPH_URL_BETA, $url);
     }
 
-    public function testGraphVideoUrlCanBeSet()
+    public function testGraphVideoUrlCanBeSet(): void
     {
         $client = new FacebookClient();
         $client->enableBetaMode(false);
@@ -122,17 +124,17 @@ public function testGraphVideoUrlCanBeSet()
         $this->assertEquals(FacebookClient::BASE_GRAPH_VIDEO_URL_BETA, $url);
     }
 
-    public function testAFacebookRequestEntityCanBeUsedToSendARequestToGraph()
+    public function testAFacebookRequestEntityCanBeUsedToSendARequestToGraph(): void
     {
         $fbRequest = new FacebookRequest($this->fbApp, 'token', 'GET', '/foo');
         $response = $this->fbClient->sendRequest($fbRequest);
 
-        $this->assertInstanceOf('Facebook\FacebookResponse', $response);
+        $this->assertInstanceOf(FacebookResponse::class, $response);
         $this->assertEquals(200, $response->getHttpStatusCode());
         $this->assertEquals('{"data":[{"id":"123","name":"Foo"},{"id":"1337","name":"Bar"}]}', $response->getBody());
     }
 
-    public function testAFacebookBatchRequestEntityCanBeUsedToSendABatchRequestToGraph()
+    public function testAFacebookBatchRequestEntityCanBeUsedToSendABatchRequestToGraph(): void
     {
         $fbRequests = [
             new FacebookRequest($this->fbApp, 'token', 'GET', '/foo'),
@@ -143,12 +145,12 @@ public function testAFacebookBatchRequestEntityCanBeUsedToSendABatchRequestToGra
         $fbBatchClient = new FacebookClient(new MyFooBatchClientHandler());
         $response = $fbBatchClient->sendBatchRequest($fbBatchRequest);
 
-        $this->assertInstanceOf('Facebook\FacebookBatchResponse', $response);
+        $this->assertInstanceOf(FacebookBatchResponse::class, $response);
         $this->assertEquals('GET', $response[0]->getRequest()->getMethod());
         $this->assertEquals('POST', $response[1]->getRequest()->getMethod());
     }
 
-    public function testAFacebookBatchRequestWillProperlyBatchFiles()
+    public function testAFacebookBatchRequestWillProperlyBatchFiles(): void
     {
         $fbRequests = [
             new FacebookRequest($this->fbApp, 'token', 'POST', '/photo', [
@@ -163,19 +165,19 @@ public function testAFacebookBatchRequestWillProperlyBatchFiles()
         $fbBatchRequest = new FacebookBatchRequest($this->fbApp, $fbRequests);
         $fbBatchRequest->prepareRequestsForBatch();
 
-        list($url, $method, $headers, $body) = $this->fbClient->prepareRequestMessage($fbBatchRequest);
+        [$url, $method, $headers, $body] = $this->fbClient->prepareRequestMessage($fbBatchRequest);
 
         $this->assertEquals(FacebookClient::BASE_GRAPH_VIDEO_URL . '/' . Facebook::DEFAULT_GRAPH_VERSION, $url);
         $this->assertEquals('POST', $method);
-        $this->assertContains('multipart/form-data; boundary=', $headers['Content-Type']);
-        $this->assertContains('Content-Disposition: form-data; name="batch"', $body);
-        $this->assertContains('Content-Disposition: form-data; name="include_headers"', $body);
-        $this->assertContains('"name":0,"attached_files":', $body);
-        $this->assertContains('"name":1,"attached_files":', $body);
-        $this->assertContains('"; filename="foo.txt"', $body);
+        $this->assertStringContainsString('multipart/form-data; boundary=', $headers['Content-Type']);
+        $this->assertStringContainsString('Content-Disposition: form-data; name="batch"', $body);
+        $this->assertStringContainsString('Content-Disposition: form-data; name="include_headers"', $body);
+        $this->assertStringContainsString('"name":0,"attached_files":', $body);
+        $this->assertStringContainsString('"name":1,"attached_files":', $body);
+        $this->assertStringContainsString('"; filename="foo.txt"', $body);
     }
 
-    public function testARequestOfParamsWillBeUrlEncoded()
+    public function testARequestOfParamsWillBeUrlEncoded(): void
     {
         $fbRequest = new FacebookRequest($this->fbApp, 'token', 'POST', '/foo', ['foo' => 'bar']);
         $response = $this->fbClient->sendRequest($fbRequest);
@@ -185,7 +187,7 @@ public function testARequestOfParamsWillBeUrlEncoded()
         $this->assertEquals('application/x-www-form-urlencoded', $headersSent['Content-Type']);
     }
 
-    public function testARequestWithFilesWillBeMultipart()
+    public function testARequestWithFilesWillBeMultipart(): void
     {
         $myFile = new FacebookFile(__DIR__ . '/foo.txt');
         $fbRequest = new FacebookRequest($this->fbApp, 'token', 'POST', '/foo', ['file' => $myFile]);
@@ -193,12 +195,12 @@ public function testARequestWithFilesWillBeMultipart()
 
         $headersSent = $response->getRequest()->getHeaders();
 
-        $this->assertContains('multipart/form-data; boundary=', $headersSent['Content-Type']);
+        $this->assertStringContainsString('multipart/form-data; boundary=', $headersSent['Content-Type']);
     }
 
-    public function testAFacebookRequestValidatesTheAccessTokenWhenOneIsNotProvided()
+    public function testAFacebookRequestValidatesTheAccessTokenWhenOneIsNotProvided(): void
     {
-        $this->setExpectedException('Facebook\Exceptions\FacebookSDKException');
+        $this->expectException(FacebookSDKException::class);
 
         $fbRequest = new FacebookRequest($this->fbApp, null, 'GET', '/foo');
         $this->fbClient->sendRequest($fbRequest);
@@ -207,7 +209,7 @@ public function testAFacebookRequestValidatesTheAccessTokenWhenOneIsNotProvided(
     /**
      * @group integration
      */
-    public function testCanCreateATestUserAndGetTheProfileAndThenDeleteTheTestUser()
+    public function testCanCreateATestUserAndGetTheProfileAndThenDeleteTheTestUser(): void
     {
         $this->initializeTestApp();
 
@@ -241,7 +243,7 @@ public function testCanCreateATestUserAndGetTheProfileAndThenDeleteTheTestUser()
         );
         $graphNode = static::$testFacebookClient->sendRequest($request)->getGraphNode();
 
-        $this->assertInstanceOf('Facebook\GraphNodes\GraphNode', $graphNode);
+        $this->assertInstanceOf(GraphNode::class, $graphNode);
         $this->assertNotNull($graphNode->getField('id'));
         $this->assertEquals('Foo Phpunit User', $graphNode->getField('name'));
 
@@ -257,7 +259,7 @@ public function testCanCreateATestUserAndGetTheProfileAndThenDeleteTheTestUser()
         $this->assertTrue($graphNode->getField('success'));
     }
 
-    public function initializeTestApp()
+    public function initializeTestApp(): void
     {
         if (!file_exists(__DIR__ . '/FacebookTestCredentials.php')) {
             throw new FacebookSDKException(
diff --git a/tests/FacebookRequestTest.php b/tests/FacebookRequestTest.php
index 697fd94ca..0d2e40f6b 100755
--- a/tests/FacebookRequestTest.php
+++ b/tests/FacebookRequestTest.php
@@ -29,7 +29,7 @@
 use Facebook\FileUpload\FacebookFile;
 use Facebook\FileUpload\FacebookVideo;
 
-class FacebookRequestTest extends \PHPUnit_Framework_TestCase
+class FacebookRequestTest extends BaseTestCase
 {
     public function testAnEmptyRequestEntityCanInstantiate()
     {
@@ -39,33 +39,27 @@ public function testAnEmptyRequestEntityCanInstantiate()
         $this->assertInstanceOf('Facebook\FacebookRequest', $request);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAMissingAccessTokenWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $app = new FacebookApp('123', 'foo_secret');
         $request = new FacebookRequest($app);
 
         $request->validateAccessToken();
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAMissingMethodWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $app = new FacebookApp('123', 'foo_secret');
         $request = new FacebookRequest($app);
 
         $request->validateMethod();
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAnInvalidMethodWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $app = new FacebookApp('123', 'foo_secret');
         $request = new FacebookRequest($app, 'foo_token', 'FOO');
 
@@ -109,11 +103,9 @@ public function testAnAccessTokenCanBeSetFromTheParams()
         $this->assertEquals('bar_token', $accessToken);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAccessTokenConflictsWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $app = new FacebookApp('123', 'foo_secret');
         new FacebookRequest($app, 'foo_token', 'POST', '/me', ['access_token' => 'bar_token']);
     }
diff --git a/tests/FacebookResponseTest.php b/tests/FacebookResponseTest.php
index be37cbde3..4181550f8 100755
--- a/tests/FacebookResponseTest.php
+++ b/tests/FacebookResponseTest.php
@@ -27,14 +27,14 @@
 use Facebook\FacebookRequest;
 use Facebook\FacebookResponse;
 
-class FacebookResponseTest extends \PHPUnit_Framework_TestCase
+class FacebookResponseTest extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookRequest
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_secret');
         $this->request = new FacebookRequest(
diff --git a/tests/FacebookTest.php b/tests/FacebookTest.php
index 035e8d70f..bc1fea35a 100644
--- a/tests/FacebookTest.php
+++ b/tests/FacebookTest.php
@@ -23,6 +23,8 @@
  */
 namespace Facebook\Tests;
 
+use Facebook\Exceptions\FacebookResponseException;
+use Facebook\Exceptions\FacebookSDKException;
 use Facebook\Facebook;
 use Facebook\FacebookClient;
 use Facebook\FacebookRequest;
@@ -33,19 +35,19 @@
 use Facebook\Tests\Fixtures\FooClientInterface;
 use Facebook\Tests\Fixtures\FooPersistentDataInterface;
 use Facebook\Tests\Fixtures\FooUrlDetectionInterface;
+use InvalidArgumentException;
 
-class FacebookTest extends \PHPUnit_Framework_TestCase
+class FacebookTest extends BaseTestCase
 {
     protected $config = [
         'app_id' => '1337',
         'app_secret' => 'foo_secret',
     ];
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testInstantiatingWithoutAppIdThrows()
     {
+        $this->expectException(FacebookSDKException::class)
+        ;
         // unset value so there is no fallback to test expected Exception
         putenv(Facebook::APP_ID_ENV_NAME.'=');
         $config = [
@@ -54,11 +56,10 @@ public function testInstantiatingWithoutAppIdThrows()
         new Facebook($config);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testInstantiatingWithoutAppSecretThrows()
     {
+        $this->expectException(FacebookSDKException::class);
+
         // unset value so there is no fallback to test expected Exception
         putenv(Facebook::APP_SECRET_ENV_NAME.'=');
         $config = [
@@ -67,11 +68,10 @@ public function testInstantiatingWithoutAppSecretThrows()
         new Facebook($config);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testSettingAnInvalidHttpClientHandlerThrows()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $config = array_merge($this->config, [
             'http_client_handler' => 'foo_handler',
         ]);
@@ -117,11 +117,9 @@ public function testGuzzleHttpClientHandlerCanBeForced()
         );
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testSettingAnInvalidPersistentDataHandlerThrows()
     {
+        $this->expectException(InvalidArgumentException::class);
         $config = array_merge($this->config, [
             'persistent_data_handler' => 'foo_handler',
         ]);
@@ -146,7 +144,7 @@ public function testSettingAnInvalidUrlHandlerThrows()
             ? 'TypeError'
             : 'PHPUnit_Framework_Error';
 
-        $this->setExpectedException($expectedException);
+        $this->expectException($expectedException);
 
         $config = array_merge($this->config, [
             'url_detection_handler' => 'foo_handler',
@@ -180,11 +178,9 @@ public function testAnAccessTokenCanBeSetAsAnAccessTokenEntity()
         $this->assertEquals('bar_token', (string)$accessToken);
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testSettingAnInvalidPseudoRandomStringGeneratorThrows()
     {
+        $this->expectException(InvalidArgumentException::class);
         $config = array_merge($this->config, [
             'pseudo_random_string_generator' => 'foo_generator',
         ]);
@@ -273,11 +269,9 @@ public function testUrandomCsprgCanBeForced()
         );
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testSettingAnAccessThatIsNotStringOrAccessTokenThrows()
     {
+        $this->expectException(InvalidArgumentException::class);
         $config = array_merge($this->config, [
             'default_access_token' => 123,
         ]);
@@ -402,11 +396,9 @@ public function testCanGetSuccessfulTransferWithMaxTries()
         ], $response);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookResponseException
-     */
     public function testMaxingOutRetriesWillThrow()
     {
+        $this->expectException(FacebookResponseException::class);
         $client = new FakeGraphApiForResumableUpload();
         $client->failOnTransfer();
 
diff --git a/tests/FileUpload/FacebookFileTest.php b/tests/FileUpload/FacebookFileTest.php
index 8ef741708..b9d2e8d46 100644
--- a/tests/FileUpload/FacebookFileTest.php
+++ b/tests/FileUpload/FacebookFileTest.php
@@ -24,12 +24,13 @@
 namespace Facebook\Tests\FileUpload;
 
 use Facebook\FileUpload\FacebookFile;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookFileTest extends \PHPUnit_Framework_TestCase
+class FacebookFileTest extends BaseTestCase
 {
     protected $testFile = '';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->testFile = __DIR__ . '/../foo.txt';
     }
@@ -50,11 +51,9 @@ public function testPartialFilesCanBeCreated()
         $this->assertEquals('is a text file', $fileContents);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testTryingToOpenAFileThatDoesntExistsThrows()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         new FacebookFile('does_not_exist.file');
     }
 }
diff --git a/tests/FileUpload/FacebookResumableUploaderTest.php b/tests/FileUpload/FacebookResumableUploaderTest.php
index dfdbe6f41..d3d04f4cb 100644
--- a/tests/FileUpload/FacebookResumableUploaderTest.php
+++ b/tests/FileUpload/FacebookResumableUploaderTest.php
@@ -29,9 +29,10 @@
 use Facebook\FacebookClient;
 use Facebook\FileUpload\FacebookResumableUploader;
 use Facebook\FileUpload\FacebookTransferChunk;
+use Facebook\Tests\BaseTestCase;
 use Facebook\Tests\Fixtures\FakeGraphApiForResumableUpload;
 
-class FacebookResumableUploaderTest extends \PHPUnit_Framework_TestCase
+class FacebookResumableUploaderTest extends BaseTestCase
 {
     /**
      * @var FacebookApp
@@ -53,7 +54,7 @@ class FacebookResumableUploaderTest extends \PHPUnit_Framework_TestCase
      */
     private $file;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fbApp = new FacebookApp('app_id', 'app_secret');
         $this->graphApi = new FakeGraphApiForResumableUpload();
@@ -78,11 +79,9 @@ public function testResumableUploadCanStartTransferAndFinish()
         $this->assertTrue($finalResponse);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookResponseException
-     */
     public function testStartWillLetErrorResponsesThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookResponseException::class);
         $this->graphApi->failOnStart();
         $uploader = new FacebookResumableUploader($this->fbApp, $this->client, 'access_token', 'v2.4');
 
diff --git a/tests/FileUpload/MimetypesTest.php b/tests/FileUpload/MimetypesTest.php
index 14fc2b9dd..2cbae3531 100644
--- a/tests/FileUpload/MimetypesTest.php
+++ b/tests/FileUpload/MimetypesTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\FileUpload;
 
 use Facebook\FileUpload\Mimetypes;
+use Facebook\Tests\BaseTestCase;
 
-class MimetypesTest extends \PHPUnit_Framework_TestCase
+class MimetypesTest extends BaseTestCase
 {
 
     /**
diff --git a/tests/GraphNodes/AbstractGraphNode.php b/tests/GraphNodes/AbstractGraphNode.php
index b4f0e909b..6708e1a14 100644
--- a/tests/GraphNodes/AbstractGraphNode.php
+++ b/tests/GraphNodes/AbstractGraphNode.php
@@ -23,17 +23,18 @@
  */
 namespace Facebook\Tests\GraphNodes;
 
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-abstract class AbstractGraphNode extends \PHPUnit_Framework_TestCase
+abstract class AbstractGraphNode extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookResponse|\Mockery\MockInterface
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->responseMock = m::mock('\Facebook\FacebookResponse');
diff --git a/tests/GraphNodes/CollectionTest.php b/tests/GraphNodes/CollectionTest.php
index 14af47684..05ffb9402 100755
--- a/tests/GraphNodes/CollectionTest.php
+++ b/tests/GraphNodes/CollectionTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\GraphNodes;
 
 use Facebook\GraphNodes\Collection;
+use Facebook\Tests\BaseTestCase;
 
-class CollectionTest extends \PHPUnit_Framework_TestCase
+class CollectionTest extends BaseTestCase
 {
 
     public function testAnExistingPropertyCanBeAccessed()
diff --git a/tests/GraphNodes/GraphAlbumTest.php b/tests/GraphNodes/GraphAlbumTest.php
index 0c4eab5ef..6b6b5b447 100644
--- a/tests/GraphNodes/GraphAlbumTest.php
+++ b/tests/GraphNodes/GraphAlbumTest.php
@@ -23,10 +23,11 @@
  */
 namespace Facebook\Tests\GraphNodes;
 
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-class GraphAlbumTest extends \PHPUnit_Framework_TestCase
+class GraphAlbumTest extends BaseTestCase
 {
 
     /**
@@ -34,7 +35,7 @@ class GraphAlbumTest extends \PHPUnit_Framework_TestCase
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->responseMock = m::mock('\\Facebook\\FacebookResponse');
     }
diff --git a/tests/GraphNodes/GraphEdgeTest.php b/tests/GraphNodes/GraphEdgeTest.php
index 3afaf9cfb..533f31b0b 100644
--- a/tests/GraphNodes/GraphEdgeTest.php
+++ b/tests/GraphNodes/GraphEdgeTest.php
@@ -27,8 +27,9 @@
 use Facebook\FacebookRequest;
 use Facebook\GraphNodes\GraphEdge;
 use Facebook\GraphNodes\GraphNode;
+use Facebook\Tests\BaseTestCase;
 
-class GraphEdgeTest extends \PHPUnit_Framework_TestCase
+class GraphEdgeTest extends BaseTestCase
 {
 
     /**
@@ -41,7 +42,7 @@ class GraphEdgeTest extends \PHPUnit_Framework_TestCase
         'previous' => 'https://graph.facebook.com/v7.12/998899/photos?pretty=0&limit=25&before=foo_before_cursor',
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_app_secret');
         $this->request = new FacebookRequest(
@@ -55,11 +56,9 @@ protected function setUp()
         );
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testNonGetRequestsWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $this->request->setMethod('POST');
         $graphEdge = new GraphEdge($this->request);
         $graphEdge->validateForPagination();
diff --git a/tests/GraphNodes/GraphEventTest.php b/tests/GraphNodes/GraphEventTest.php
index 7c6f12708..5d27f3b5d 100644
--- a/tests/GraphNodes/GraphEventTest.php
+++ b/tests/GraphNodes/GraphEventTest.php
@@ -24,17 +24,18 @@
 namespace Facebook\Tests\GraphNodes;
 
 use Facebook\FacebookResponse;
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-class GraphEventTest extends \PHPUnit_Framework_TestCase
+class GraphEventTest extends BaseTestCase
 {
     /**
      * @var FacebookResponse
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->responseMock = m::mock('\Facebook\FacebookResponse');
     }
diff --git a/tests/GraphNodes/GraphGroupTest.php b/tests/GraphNodes/GraphGroupTest.php
index c62d50fb0..aacd30a53 100644
--- a/tests/GraphNodes/GraphGroupTest.php
+++ b/tests/GraphNodes/GraphGroupTest.php
@@ -24,17 +24,18 @@
 namespace Facebook\Tests\GraphNodes;
 
 use Facebook\FacebookResponse;
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-class GraphGroupTest extends \PHPUnit_Framework_TestCase
+class GraphGroupTest extends BaseTestCase
 {
     /**
      * @var FacebookResponse
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->responseMock = m::mock('\Facebook\FacebookResponse');
     }
diff --git a/tests/GraphNodes/GraphNodeFactoryTest.php b/tests/GraphNodes/GraphNodeFactoryTest.php
index 5772c0ad5..bb6751287 100644
--- a/tests/GraphNodes/GraphNodeFactoryTest.php
+++ b/tests/GraphNodes/GraphNodeFactoryTest.php
@@ -27,15 +27,16 @@
 use Facebook\FacebookRequest;
 use Facebook\FacebookResponse;
 use Facebook\GraphNodes\GraphNodeFactory;
+use Facebook\Tests\BaseTestCase;
 
-class GraphNodeFactoryTest extends \PHPUnit_Framework_TestCase
+class GraphNodeFactoryTest extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookRequest
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_app_secret');
         $this->request = new FacebookRequest(
@@ -58,11 +59,9 @@ public function testAValidGraphNodeResponseWillNotThrow()
         $factory->validateResponseCastableAsGraphNode();
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testANonGraphNodeResponseWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $data = '{"data":[{"id":"123","name":"foo"},{"id":"1337","name":"bar"}]}';
         $res = new FacebookResponse($this->request, $data);
 
@@ -79,11 +78,9 @@ public function testAValidGraphEdgeResponseWillNotThrow()
         $factory->validateResponseCastableAsGraphEdge();
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testANonGraphEdgeResponseWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $data = '{"id":"123","name":"foo"}';
         $res = new FacebookResponse($this->request, $data);
 
@@ -102,11 +99,9 @@ public function testOnlyNumericArraysAreCastableAsAGraphEdge()
         $this->assertFalse($shouldFail, 'Expected the given array to not be castable as a GraphEdge.');
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testInvalidSubClassesWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         GraphNodeFactory::validateSubclass('FooSubClass');
     }
 
diff --git a/tests/GraphNodes/GraphNodeTest.php b/tests/GraphNodes/GraphNodeTest.php
index 67444fae8..933c948fc 100644
--- a/tests/GraphNodes/GraphNodeTest.php
+++ b/tests/GraphNodes/GraphNodeTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\GraphNodes;
 
 use Facebook\GraphNodes\GraphNode;
+use Facebook\Tests\BaseTestCase;
 
-class GraphNodeTest extends \PHPUnit_Framework_TestCase
+class GraphNodeTest extends BaseTestCase
 {
     public function testAnEmptyBaseGraphNodeCanInstantiate()
     {
diff --git a/tests/GraphNodes/GraphObjectFactoryTest.php b/tests/GraphNodes/GraphObjectFactoryTest.php
index 3ef1d0bc1..71ae5c4c8 100644
--- a/tests/GraphNodes/GraphObjectFactoryTest.php
+++ b/tests/GraphNodes/GraphObjectFactoryTest.php
@@ -27,18 +27,19 @@
 use Facebook\FacebookApp;
 use Facebook\FacebookRequest;
 use Facebook\FacebookResponse;
+use Facebook\Tests\BaseTestCase;
 
 /**
  * @todo v6: Remove this test
  */
-class GraphObjectFactoryTest extends \PHPUnit_Framework_TestCase
+class GraphObjectFactoryTest extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookRequest
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_app_secret');
         $this->request = new FacebookRequest(
diff --git a/tests/GraphNodes/GraphPageTest.php b/tests/GraphNodes/GraphPageTest.php
index c7ce163c9..6600c23f0 100644
--- a/tests/GraphNodes/GraphPageTest.php
+++ b/tests/GraphNodes/GraphPageTest.php
@@ -23,17 +23,18 @@
  */
 namespace Facebook\Tests\GraphNodes;
 
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-class GraphPageTest extends \PHPUnit_Framework_TestCase
+class GraphPageTest extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookResponse
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->responseMock = m::mock('\\Facebook\\FacebookResponse');
     }
diff --git a/tests/GraphNodes/GraphSessionInfoTest.php b/tests/GraphNodes/GraphSessionInfoTest.php
index b2e56faed..df8bc85ac 100644
--- a/tests/GraphNodes/GraphSessionInfoTest.php
+++ b/tests/GraphNodes/GraphSessionInfoTest.php
@@ -23,17 +23,18 @@
  */
 namespace Facebook\Tests\GraphNodes;
 
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-class GraphSessionInfoTest extends \PHPUnit_Framework_TestCase
+class GraphSessionInfoTest extends BaseTestCase
 {
     /**
      * @var \Facebook\FacebookResponse
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->responseMock = m::mock('\\Facebook\\FacebookResponse');
     }
diff --git a/tests/GraphNodes/GraphUserTest.php b/tests/GraphNodes/GraphUserTest.php
index a3230fa36..037b35462 100644
--- a/tests/GraphNodes/GraphUserTest.php
+++ b/tests/GraphNodes/GraphUserTest.php
@@ -24,17 +24,18 @@
 namespace Facebook\Tests\GraphNodes;
 
 use Facebook\FacebookResponse;
+use Facebook\Tests\BaseTestCase;
 use Mockery as m;
 use Facebook\GraphNodes\GraphNodeFactory;
 
-class GraphUserTest extends \PHPUnit_Framework_TestCase
+class GraphUserTest extends BaseTestCase
 {
     /**
      * @var FacebookResponse
      */
     protected $responseMock;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->responseMock = m::mock('\\Facebook\\FacebookResponse');
     }
diff --git a/tests/Helpers/FacebookCanvasHelperTest.php b/tests/Helpers/FacebookCanvasHelperTest.php
index f03d66fbc..c366c3206 100644
--- a/tests/Helpers/FacebookCanvasHelperTest.php
+++ b/tests/Helpers/FacebookCanvasHelperTest.php
@@ -26,8 +26,9 @@
 use Facebook\FacebookApp;
 use Facebook\FacebookClient;
 use Facebook\Helpers\FacebookCanvasHelper;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookCanvasHelperTest extends \PHPUnit_Framework_TestCase
+class FacebookCanvasHelperTest extends BaseTestCase
 {
     public $rawSignedRequestAuthorized = 'vdZXlVEQ5NTRRTFvJ7Jeo_kP4SKnBDvbNP0fEYKS0Sg=.eyJvYXV0aF90b2tlbiI6ImZvb190b2tlbiIsImFsZ29yaXRobSI6IkhNQUMtU0hBMjU2IiwiaXNzdWVkX2F0IjoxNDAyNTUxMDMxLCJ1c2VyX2lkIjoiMTIzIn0=';
 
@@ -36,7 +37,7 @@ class FacebookCanvasHelperTest extends \PHPUnit_Framework_TestCase
      */
     protected $helper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_app_secret');
         $this->helper = new FacebookCanvasHelper($app, new FacebookClient());
diff --git a/tests/Helpers/FacebookJavaScriptHelperTest.php b/tests/Helpers/FacebookJavaScriptHelperTest.php
index 521875885..295683307 100644
--- a/tests/Helpers/FacebookJavaScriptHelperTest.php
+++ b/tests/Helpers/FacebookJavaScriptHelperTest.php
@@ -26,8 +26,9 @@
 use Facebook\FacebookApp;
 use Facebook\FacebookClient;
 use Facebook\Helpers\FacebookJavaScriptHelper;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookJavaScriptHelperTest extends \PHPUnit_Framework_TestCase
+class FacebookJavaScriptHelperTest extends BaseTestCase
 {
     public $rawSignedRequestAuthorized = 'vdZXlVEQ5NTRRTFvJ7Jeo_kP4SKnBDvbNP0fEYKS0Sg=.eyJvYXV0aF90b2tlbiI6ImZvb190b2tlbiIsImFsZ29yaXRobSI6IkhNQUMtU0hBMjU2IiwiaXNzdWVkX2F0IjoxNDAyNTUxMDMxLCJ1c2VyX2lkIjoiMTIzIn0=';
 
diff --git a/tests/Helpers/FacebookPageTabHelperTest.php b/tests/Helpers/FacebookPageTabHelperTest.php
index 5c27f488a..d13606eaf 100644
--- a/tests/Helpers/FacebookPageTabHelperTest.php
+++ b/tests/Helpers/FacebookPageTabHelperTest.php
@@ -26,8 +26,9 @@
 use Facebook\FacebookApp;
 use Facebook\FacebookClient;
 use Facebook\Helpers\FacebookPageTabHelper;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookPageTabHelperTest extends \PHPUnit_Framework_TestCase
+class FacebookPageTabHelperTest extends BaseTestCase
 {
     protected $rawSignedRequestAuthorized = '6Hi26ECjkj347belC0O8b8H5lwiIz5eA6V9VVjTg-HU=.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImlzc3VlZF9hdCI6MzIxLCJvYXV0aF90b2tlbiI6ImZvb190b2tlbiIsInVzZXJfaWQiOiIxMjMiLCJwYWdlIjp7ImlkIjoiNDIiLCJsaWtlZCI6dHJ1ZSwiYWRtaW4iOmZhbHNlfX0=';
 
diff --git a/tests/Helpers/FacebookRedirectLoginHelperTest.php b/tests/Helpers/FacebookRedirectLoginHelperTest.php
index be31689a2..45a757288 100644
--- a/tests/Helpers/FacebookRedirectLoginHelperTest.php
+++ b/tests/Helpers/FacebookRedirectLoginHelperTest.php
@@ -28,10 +28,12 @@
 use Facebook\FacebookClient;
 use Facebook\Helpers\FacebookRedirectLoginHelper;
 use Facebook\PersistentData\FacebookMemoryPersistentDataHandler;
+use Facebook\Tests\BaseTestCase;
 use Facebook\Tests\Fixtures\FooPseudoRandomStringGenerator;
 use Facebook\Tests\Fixtures\FooRedirectLoginOAuth2Client;
+use Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface;
 
-class FacebookRedirectLoginHelperTest extends \PHPUnit_Framework_TestCase
+class FacebookRedirectLoginHelperTest extends BaseTestCase
 {
     /**
      * @var FacebookMemoryPersistentDataHandler
@@ -49,7 +51,7 @@ class FacebookRedirectLoginHelperTest extends \PHPUnit_Framework_TestCase
     const FOO_STATE = "foo_state";
     const FOO_PARAM = "some_param=blah";
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->persistentDataHandler = new FacebookMemoryPersistentDataHandler();
 
@@ -58,13 +60,13 @@ protected function setUp()
         $this->redirectLoginHelper = new FacebookRedirectLoginHelper($oAuth2Client, $this->persistentDataHandler);
     }
 
-    public function testLoginURL()
+    public function testLoginURL(): void
     {
         $scope = ['foo', 'bar'];
         $loginUrl = $this->redirectLoginHelper->getLoginUrl(self::REDIRECT_URL, $scope);
 
         $expectedUrl = 'https://www.facebook.com/v1337/dialog/oauth?';
-        $this->assertTrue(strpos($loginUrl, $expectedUrl) === 0, 'Unexpected base login URL returned from getLoginUrl().');
+        $this->assertSame(strpos($loginUrl, $expectedUrl), 0, 'Unexpected base login URL returned from getLoginUrl().');
 
         $params = [
             'client_id' => '123',
@@ -74,28 +76,33 @@ public function testLoginURL()
             'scope' => implode(',', $scope),
         ];
         foreach ($params as $key => $value) {
-            $this->assertContains($key . '=' . urlencode($value), $loginUrl);
+            $this->assertStringContainsString($key . '=' . urlencode($value), $loginUrl);
         }
     }
 
-    public function testLogoutURL()
+    public function testLogoutURL(): void
     {
         $logoutUrl = $this->redirectLoginHelper->getLogoutUrl('foo_token', self::REDIRECT_URL);
         $expectedUrl = 'https://www.facebook.com/logout.php?';
-        $this->assertTrue(strpos($logoutUrl, $expectedUrl) === 0, 'Unexpected base logout URL returned from getLogoutUrl().');
+        $this->assertSame(
+            strpos($logoutUrl, $expectedUrl),
+            0,
+            'Unexpected base logout URL returned from getLogoutUrl().'
+        );
 
         $params = [
             'next' => self::REDIRECT_URL,
             'access_token' => 'foo_token',
         ];
         foreach ($params as $key => $value) {
-            $this->assertTrue(
-                strpos($logoutUrl, $key . '=' . urlencode($value)) !== false
+            $this->assertNotSame(
+                strpos($logoutUrl, $key . '=' . urlencode($value)),
+                false
             );
         }
     }
 
-    public function testAnAccessTokenCanBeObtainedFromRedirect()
+    public function testAnAccessTokenCanBeObtainedFromRedirect(): void
     {
         $this->persistentDataHandler->set('state', static::FOO_STATE);
 
@@ -114,7 +121,7 @@ public function testAnAccessTokenCanBeObtainedFromRedirect()
         $this->assertEquals($expectedString, $accessToken->getValue());
     }
 
-    public function testACustomCsprsgCanBeInjected()
+    public function testACustomCsprsgCanBeInjected(): void
     {
         $app = new FacebookApp('123', 'foo_app_secret');
         $accessTokenClient = new FooRedirectLoginOAuth2Client($app, new FacebookClient(), 'v1337');
@@ -123,13 +130,13 @@ public function testACustomCsprsgCanBeInjected()
 
         $loginUrl = $helper->getLoginUrl(self::REDIRECT_URL);
 
-        $this->assertContains('state=csprs123', $loginUrl);
+        $this->assertStringContainsString('state=csprs123', $loginUrl);
     }
 
-    public function testThePseudoRandomStringGeneratorWillAutoDetectCsprsg()
+    public function testThePseudoRandomStringGeneratorWillAutoDetectCsprsg(): void
     {
         $this->assertInstanceOf(
-            'Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface',
+            PseudoRandomStringGeneratorInterface::class,
             $this->redirectLoginHelper->getPseudoRandomStringGenerator()
         );
     }
diff --git a/tests/Helpers/FacebookSignedRequestFromInputHelperTest.php b/tests/Helpers/FacebookSignedRequestFromInputHelperTest.php
index ffaa5e329..78f496547 100644
--- a/tests/Helpers/FacebookSignedRequestFromInputHelperTest.php
+++ b/tests/Helpers/FacebookSignedRequestFromInputHelperTest.php
@@ -24,10 +24,11 @@
 namespace Facebook\Tests\Helpers;
 
 use Facebook\FacebookApp;
+use Facebook\Tests\BaseTestCase;
 use Facebook\Tests\Fixtures\FooSignedRequestHelper;
 use Facebook\Tests\Fixtures\FooSignedRequestHelperFacebookClient;
 
-class FacebookSignedRequestFromInputHelperTest extends \PHPUnit_Framework_TestCase
+class FacebookSignedRequestFromInputHelperTest extends BaseTestCase
 {
     /**
      * @var FooSignedRequestHelper
@@ -38,7 +39,7 @@ class FacebookSignedRequestFromInputHelperTest extends \PHPUnit_Framework_TestCa
     public $rawSignedRequestAuthorizedWithCode = 'oBtmZlsFguNQvGRETDYQQu1-PhwcArgbBBEK4urbpRA=.eyJjb2RlIjoiZm9vX2NvZGUiLCJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImlzc3VlZF9hdCI6MTQwNjMxMDc1MiwidXNlcl9pZCI6IjEyMyJ9';
     public $rawSignedRequestUnauthorized = 'KPlyhz-whtYAhHWr15N5TkbS_avz-2rUJFpFkfXKC88=.eyJhbGdvcml0aG0iOiJITUFDLVNIQTI1NiIsImlzc3VlZF9hdCI6MTQwMjU1MTA4Nn0=';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $app = new FacebookApp('123', 'foo_app_secret');
         $this->helper = new FooSignedRequestHelper($app, new FooSignedRequestHelperFacebookClient());
diff --git a/tests/Http/GraphRawResponseTest.php b/tests/Http/GraphRawResponseTest.php
index fcb71f480..70e19d006 100644
--- a/tests/Http/GraphRawResponseTest.php
+++ b/tests/Http/GraphRawResponseTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\Http;
 
 use Facebook\Http\GraphRawResponse;
+use Facebook\Tests\BaseTestCase;
 
-class GraphRawResponseTest extends \PHPUnit_Framework_TestCase
+class GraphRawResponseTest extends BaseTestCase
 {
 
     protected $fakeRawProxyHeader = "HTTP/1.0 200 Connection established
@@ -51,7 +52,7 @@ class GraphRawResponseTest extends \PHPUnit_Framework_TestCase
     protected $jsonFakeHeader = 'x-fb-ads-insights-throttle: {"app_id_util_pct": 0.00,"acc_id_util_pct": 0.00}';
     protected $jsonFakeHeaderAsArray = ['x-fb-ads-insights-throttle' => '{"app_id_util_pct": 0.00,"acc_id_util_pct": 0.00}'];
 
-    public function testCanSetTheHeadersFromAnArray()
+    public function testCanSetTheHeadersFromAnArray(): void
     {
         $myHeaders = [
             'foo' => 'bar',
@@ -63,7 +64,7 @@ public function testCanSetTheHeadersFromAnArray()
         $this->assertEquals($myHeaders, $headers);
     }
 
-    public function testCanSetTheHeadersFromAString()
+    public function testCanSetTheHeadersFromAString(): void
     {
         $response = new GraphRawResponse($this->fakeRawHeader, '');
         $headers = $response->getHeaders();
@@ -73,7 +74,7 @@ public function testCanSetTheHeadersFromAString()
         $this->assertEquals(200, $httpResponseCode);
     }
 
-    public function testWillIgnoreProxyHeaders()
+    public function testWillIgnoreProxyHeaders(): void
     {
         $response = new GraphRawResponse($this->fakeRawProxyHeader . $this->fakeRawHeader, '');
         $headers = $response->getHeaders();
@@ -83,7 +84,7 @@ public function testWillIgnoreProxyHeaders()
         $this->assertEquals(200, $httpResponseCode);
     }
 
-    public function testCanTransformJsonHeaderValues()
+    public function testCanTransformJsonHeaderValues(): void
     {
         $response = new GraphRawResponse($this->jsonFakeHeader, '');
         $headers = $response->getHeaders();
@@ -91,7 +92,7 @@ public function testCanTransformJsonHeaderValues()
         $this->assertEquals($this->jsonFakeHeaderAsArray['x-fb-ads-insights-throttle'], $headers['x-fb-ads-insights-throttle']);
     }
     
-    public function testHttpResponseCode()
+    public function testHttpResponseCode(): void
     {
         // HTTP/1.0
         $headers = str_replace('HTTP/1.1', 'HTTP/1.0', $this->fakeRawHeader);
diff --git a/tests/Http/RequestBodyMultipartTest.php b/tests/Http/RequestBodyMultipartTest.php
index 1a23c469f..5da4f0d83 100644
--- a/tests/Http/RequestBodyMultipartTest.php
+++ b/tests/Http/RequestBodyMultipartTest.php
@@ -25,8 +25,9 @@
 
 use Facebook\Http\RequestBodyMultipart;
 use Facebook\FileUpload\FacebookFile;
+use Facebook\Tests\BaseTestCase;
 
-class RequestBodyMultipartTest extends \PHPUnit_Framework_TestCase
+class RequestBodyMultipartTest extends BaseTestCase
 {
     public function testCanProperlyEncodeAnArrayOfParams()
     {
diff --git a/tests/Http/RequestUrlEncodedTest.php b/tests/Http/RequestUrlEncodedTest.php
index 2b4f67f9b..36bed1c38 100644
--- a/tests/Http/RequestUrlEncodedTest.php
+++ b/tests/Http/RequestUrlEncodedTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\Http;
 
 use Facebook\Http\RequestBodyUrlEncoded;
+use Facebook\Tests\BaseTestCase;
 
-class RequestUrlEncodedTest extends \PHPUnit_Framework_TestCase
+class RequestUrlEncodedTest extends BaseTestCase
 {
     public function testCanProperlyEncodeAnArrayOfParams()
     {
diff --git a/tests/HttpClients/AbstractTestHttpClient.php b/tests/HttpClients/AbstractTestHttpClient.php
index a87005216..ccafed332 100644
--- a/tests/HttpClients/AbstractTestHttpClient.php
+++ b/tests/HttpClients/AbstractTestHttpClient.php
@@ -23,7 +23,9 @@
  */
 namespace Facebook\Tests\HttpClients;
 
-abstract class AbstractTestHttpClient extends \PHPUnit_Framework_TestCase
+use Facebook\Tests\BaseTestCase;
+
+abstract class AbstractTestHttpClient extends BaseTestCase
 {
     protected $fakeRawRedirectHeader = "HTTP/1.1 302 Found
 Content-Type: text/html; charset=utf-8
diff --git a/tests/HttpClients/FacebookCurlHttpClientTest.php b/tests/HttpClients/FacebookCurlHttpClientTest.php
index 47cc0274e..30049dea5 100644
--- a/tests/HttpClients/FacebookCurlHttpClientTest.php
+++ b/tests/HttpClients/FacebookCurlHttpClientTest.php
@@ -41,7 +41,7 @@ class FacebookCurlHttpClientTest extends AbstractTestHttpClient
     const CURL_VERSION_STABLE = 0x072400;
     const CURL_VERSION_BUGGY = 0x071400;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!extension_loaded('curl')) {
             $this->markTestSkipped('cURL must be installed to test cURL client handler.');
@@ -50,7 +50,7 @@ protected function setUp()
         $this->curlClient = new FacebookCurlHttpClient($this->curlMock);
     }
 
-    public function testCanOpenGetCurlConnection()
+    public function testCanOpenGetCurlConnection(): void
     {
         $this->curlMock
             ->shouldReceive('init')
@@ -93,7 +93,7 @@ public function testCanOpenGetCurlConnection()
         $this->curlClient->openConnection('http://foo.com', 'GET', 'foo_body', ['X-Foo-Header' => 'X-Bar'], 123);
     }
 
-    public function testCanOpenCurlConnectionWithPostBody()
+    public function testCanOpenCurlConnectionWithPostBody(): void
     {
         $this->curlMock
             ->shouldReceive('init')
@@ -137,7 +137,7 @@ public function testCanOpenCurlConnectionWithPostBody()
         $this->curlClient->openConnection('http://bar.com', 'POST', 'baz=bar', [], 60);
     }
 
-    public function testCanCloseConnection()
+    public function testCanCloseConnection(): void
     {
         $this->curlMock
             ->shouldReceive('close')
@@ -147,7 +147,7 @@ public function testCanCloseConnection()
         $this->curlClient->closeConnection();
     }
 
-    public function testIsolatesTheHeaderAndBody()
+    public function testIsolatesTheHeaderAndBody(): void
     {
         $this->curlMock
             ->shouldReceive('exec')
@@ -155,13 +155,13 @@ public function testIsolatesTheHeaderAndBody()
             ->andReturn($this->fakeRawHeader . $this->fakeRawBody);
 
         $this->curlClient->sendRequest();
-        list($rawHeader, $rawBody) = $this->curlClient->extractResponseHeadersAndBody();
+        [$rawHeader, $rawBody] = $this->curlClient->extractResponseHeadersAndBody();
 
         $this->assertEquals($rawHeader, trim($this->fakeRawHeader));
         $this->assertEquals($rawBody, $this->fakeRawBody);
     }
 
-    public function testProperlyHandlesProxyHeaders()
+    public function testProperlyHandlesProxyHeaders(): void
     {
         $rawHeader = $this->fakeRawProxyHeader . $this->fakeRawHeader;
         $this->curlMock
@@ -170,13 +170,13 @@ public function testProperlyHandlesProxyHeaders()
             ->andReturn($rawHeader . $this->fakeRawBody);
 
         $this->curlClient->sendRequest();
-        list($rawHeaders, $rawBody) = $this->curlClient->extractResponseHeadersAndBody();
+        [$rawHeaders, $rawBody] = $this->curlClient->extractResponseHeadersAndBody();
 
         $this->assertEquals($rawHeaders, trim($rawHeader));
         $this->assertEquals($rawBody, $this->fakeRawBody);
     }
 
-    public function testProperlyHandlesProxyHeadersWithCurlBug()
+    public function testProperlyHandlesProxyHeadersWithCurlBug(): void
     {
         $rawHeader = $this->fakeRawProxyHeader . $this->fakeRawHeader;
         $this->curlMock
@@ -185,13 +185,13 @@ public function testProperlyHandlesProxyHeadersWithCurlBug()
             ->andReturn($rawHeader . $this->fakeRawBody);
 
         $this->curlClient->sendRequest();
-        list($rawHeaders, $rawBody) = $this->curlClient->extractResponseHeadersAndBody();
+        [$rawHeaders, $rawBody] = $this->curlClient->extractResponseHeadersAndBody();
 
         $this->assertEquals($rawHeaders, trim($rawHeader));
         $this->assertEquals($rawBody, $this->fakeRawBody);
     }
 
-    public function testProperlyHandlesProxyHeadersWithCurlBug2()
+    public function testProperlyHandlesProxyHeadersWithCurlBug2(): void
     {
         $rawHeader = $this->fakeRawProxyHeader2 . $this->fakeRawHeader;
         $this->curlMock
@@ -200,13 +200,13 @@ public function testProperlyHandlesProxyHeadersWithCurlBug2()
             ->andReturn($rawHeader . $this->fakeRawBody);
 
         $this->curlClient->sendRequest();
-        list($rawHeaders, $rawBody) = $this->curlClient->extractResponseHeadersAndBody();
+        [$rawHeaders, $rawBody] = $this->curlClient->extractResponseHeadersAndBody();
 
         $this->assertEquals($rawHeaders, trim($rawHeader));
         $this->assertEquals($rawBody, $this->fakeRawBody);
     }
 
-    public function testProperlyHandlesRedirectHeaders()
+    public function testProperlyHandlesRedirectHeaders(): void
     {
         $rawHeader = $this->fakeRawRedirectHeader . $this->fakeRawHeader;
         $this->curlMock
@@ -215,13 +215,13 @@ public function testProperlyHandlesRedirectHeaders()
             ->andReturn($rawHeader . $this->fakeRawBody);
 
         $this->curlClient->sendRequest();
-        list($rawHeaders, $rawBody) = $this->curlClient->extractResponseHeadersAndBody();
+        [$rawHeaders, $rawBody] = $this->curlClient->extractResponseHeadersAndBody();
 
         $this->assertEquals($rawHeaders, trim($rawHeader));
         $this->assertEquals($rawBody, $this->fakeRawBody);
     }
 
-    public function testCanSendNormalRequest()
+    public function testCanSendNormalRequest(): void
     {
         $this->curlMock
             ->shouldReceive('init')
@@ -252,11 +252,9 @@ public function testCanSendNormalRequest()
         $this->assertEquals(200, $response->getHttpResponseCode());
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
-    public function testThrowsExceptionOnClientError()
+    public function testThrowsExceptionOnClientError(): void
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $this->curlMock
             ->shouldReceive('init')
             ->once()
diff --git a/tests/HttpClients/FacebookGuzzleHttpClientTest.php b/tests/HttpClients/FacebookGuzzleHttpClientTest.php
index f14ad96a0..3cb4432c2 100644
--- a/tests/HttpClients/FacebookGuzzleHttpClientTest.php
+++ b/tests/HttpClients/FacebookGuzzleHttpClientTest.php
@@ -42,7 +42,7 @@ class FacebookGuzzleHttpClientTest extends AbstractTestHttpClient
      */
     protected $guzzleClient;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->guzzleMock = m::mock('GuzzleHttp\Client');
         $this->guzzleClient = new FacebookGuzzleHttpClient($this->guzzleMock);
@@ -97,11 +97,9 @@ public function testCanSendNormalRequest()
         $this->assertEquals(200, $response->getHttpResponseCode());
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testThrowsExceptionOnClientError()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $request = new Request('GET', 'http://foo.com');
 
         $this->guzzleMock
diff --git a/tests/HttpClients/FacebookStreamHttpClientTest.php b/tests/HttpClients/FacebookStreamHttpClientTest.php
index 3749960e1..d5a2d7cec 100644
--- a/tests/HttpClients/FacebookStreamHttpClientTest.php
+++ b/tests/HttpClients/FacebookStreamHttpClientTest.php
@@ -38,7 +38,7 @@ class FacebookStreamHttpClientTest extends AbstractTestHttpClient
      */
     protected $streamClient;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->streamMock = m::mock('Facebook\HttpClients\FacebookStream');
         $this->streamClient = new FacebookStreamHttpClient($this->streamMock);
@@ -110,11 +110,9 @@ public function testCanSendNormalRequest()
         $this->assertEquals(200, $response->getHttpResponseCode());
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testThrowsExceptionOnClientError()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $this->streamMock
             ->shouldReceive('streamContextCreate')
             ->once()
diff --git a/tests/HttpClients/HttpClientsFactoryTest.php b/tests/HttpClients/HttpClientsFactoryTest.php
index 4d49489b9..d78dee272 100644
--- a/tests/HttpClients/HttpClientsFactoryTest.php
+++ b/tests/HttpClients/HttpClientsFactoryTest.php
@@ -27,10 +27,11 @@
 use Facebook\HttpClients\FacebookGuzzleHttpClient;
 use Facebook\HttpClients\FacebookStreamHttpClient;
 use Facebook\HttpClients\HttpClientsFactory;
+use Facebook\Tests\BaseTestCase;
 use GuzzleHttp\Client;
 use PHPUnit_Framework_TestCase;
 
-class HttpClientsFactoryTest extends PHPUnit_Framework_TestCase
+class HttpClientsFactoryTest extends BaseTestCase
 {
     const COMMON_NAMESPACE = 'Facebook\HttpClients\\';
     const COMMON_INTERFACE = 'Facebook\HttpClients\FacebookHttpClientInterface';
diff --git a/tests/PersistentData/FacebookMemoryPersistentDataHandlerTest.php b/tests/PersistentData/FacebookMemoryPersistentDataHandlerTest.php
index 89717f831..4bb59bcf8 100644
--- a/tests/PersistentData/FacebookMemoryPersistentDataHandlerTest.php
+++ b/tests/PersistentData/FacebookMemoryPersistentDataHandlerTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\PersistentData;
 
 use Facebook\PersistentData\FacebookMemoryPersistentDataHandler;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookMemoryPersistentDataHandlerTest extends \PHPUnit_Framework_TestCase
+class FacebookMemoryPersistentDataHandlerTest extends BaseTestCase
 {
     public function testCanGetAndSetAVirtualValue()
     {
diff --git a/tests/PersistentData/FacebookSessionPersistentDataHandlerTest.php b/tests/PersistentData/FacebookSessionPersistentDataHandlerTest.php
index 752d275de..6b59ce69f 100644
--- a/tests/PersistentData/FacebookSessionPersistentDataHandlerTest.php
+++ b/tests/PersistentData/FacebookSessionPersistentDataHandlerTest.php
@@ -24,14 +24,13 @@
 namespace Facebook\Tests\PersistentData;
 
 use Facebook\PersistentData\FacebookSessionPersistentDataHandler;
+use Facebook\Tests\BaseTestCase;
 
-class FacebookSessionPersistentDataHandlerTest extends \PHPUnit_Framework_TestCase
+class FacebookSessionPersistentDataHandlerTest extends BaseTestCase
 {
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testInactiveSessionsWillThrow()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         new FacebookSessionPersistentDataHandler();
     }
 
diff --git a/tests/PersistentData/PersistentDataFactoryTest.php b/tests/PersistentData/PersistentDataFactoryTest.php
index d6206fcdc..fd7f17fbd 100644
--- a/tests/PersistentData/PersistentDataFactoryTest.php
+++ b/tests/PersistentData/PersistentDataFactoryTest.php
@@ -26,9 +26,10 @@
 use Facebook\PersistentData\FacebookMemoryPersistentDataHandler;
 use Facebook\PersistentData\FacebookSessionPersistentDataHandler;
 use Facebook\PersistentData\PersistentDataFactory;
+use Facebook\Tests\BaseTestCase;
 use PHPUnit_Framework_TestCase;
 
-class PersistentDataFactoryTest extends PHPUnit_Framework_TestCase
+class PersistentDataFactoryTest extends BaseTestCase
 {
     const COMMON_NAMESPACE = 'Facebook\PersistentData\\';
     const COMMON_INTERFACE = 'Facebook\PersistentData\PersistentDataInterface';
diff --git a/tests/PseudoRandomString/McryptPseudoRandomStringGeneratorTest.php b/tests/PseudoRandomString/McryptPseudoRandomStringGeneratorTest.php
index f5e033675..62911cad7 100644
--- a/tests/PseudoRandomString/McryptPseudoRandomStringGeneratorTest.php
+++ b/tests/PseudoRandomString/McryptPseudoRandomStringGeneratorTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\PseudoRandomString;
 
 use Facebook\PseudoRandomString\McryptPseudoRandomStringGenerator;
+use Facebook\Tests\BaseTestCase;
 
-class McryptPseudoRandomStringGeneratorTest extends \PHPUnit_Framework_TestCase
+class McryptPseudoRandomStringGeneratorTest extends BaseTestCase
 {
     public function testCanGenerateRandomStringOfArbitraryLength()
     {
diff --git a/tests/PseudoRandomString/OpenSslPseudoRandomStringGeneratorTest.php b/tests/PseudoRandomString/OpenSslPseudoRandomStringGeneratorTest.php
index 3ab4edc93..d9b24f16d 100644
--- a/tests/PseudoRandomString/OpenSslPseudoRandomStringGeneratorTest.php
+++ b/tests/PseudoRandomString/OpenSslPseudoRandomStringGeneratorTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\PseudoRandomString;
 
 use Facebook\PseudoRandomString\OpenSslPseudoRandomStringGenerator;
+use Facebook\Tests\BaseTestCase;
 
-class OpenSslPseudoRandomStringGeneratorTest extends \PHPUnit_Framework_TestCase
+class OpenSslPseudoRandomStringGeneratorTest extends BaseTestCase
 {
     public function testCanGenerateRandomStringOfArbitraryLength()
     {
diff --git a/tests/PseudoRandomString/PseudoRandomStringFactoryTest.php b/tests/PseudoRandomString/PseudoRandomStringFactoryTest.php
index 9dc679e66..aa5eae464 100644
--- a/tests/PseudoRandomString/PseudoRandomStringFactoryTest.php
+++ b/tests/PseudoRandomString/PseudoRandomStringFactoryTest.php
@@ -24,9 +24,10 @@
 namespace Facebook\Tests\PseudoRandomString;
 
 use Facebook\PseudoRandomString\PseudoRandomStringGeneratorFactory;
+use Facebook\Tests\BaseTestCase;
 use PHPUnit_Framework_TestCase;
 
-class PseudoRandomStringFactoryTest extends PHPUnit_Framework_TestCase
+class PseudoRandomStringFactoryTest extends BaseTestCase
 {
     const COMMON_NAMESPACE = 'Facebook\PseudoRandomString\\';
     const COMMON_INTERFACE = 'Facebook\PseudoRandomString\PseudoRandomStringGeneratorInterface';
diff --git a/tests/PseudoRandomString/PseudoRandomStringGeneratorTraitTest.php b/tests/PseudoRandomString/PseudoRandomStringGeneratorTraitTest.php
index 16165d98c..a2850c30c 100644
--- a/tests/PseudoRandomString/PseudoRandomStringGeneratorTraitTest.php
+++ b/tests/PseudoRandomString/PseudoRandomStringGeneratorTraitTest.php
@@ -23,24 +23,24 @@
  */
 namespace Facebook\Tests\PseudoRandomString;
 
+use Facebook\Tests\BaseTestCase;
 use Facebook\Tests\Fixtures\MyFooBarPseudoRandomStringGenerator;
+use InvalidArgumentException;
 
-class PseudoRandomStringGeneratorTraitTest extends \PHPUnit_Framework_TestCase
+class PseudoRandomStringGeneratorTraitTest extends BaseTestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testAnInvalidLengthWillThrow()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $prsg = new MyFooBarPseudoRandomStringGenerator();
         $prsg->validateLength('foo_len');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testALengthThatIsNotAtLeastOneCharacterWillThrow()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $prsg = new MyFooBarPseudoRandomStringGenerator();
         $prsg->validateLength(0);
     }
diff --git a/tests/PseudoRandomString/RandomBytesPseudoRandomStringGeneratorTest.php b/tests/PseudoRandomString/RandomBytesPseudoRandomStringGeneratorTest.php
index 61f2a46a2..0c782b599 100644
--- a/tests/PseudoRandomString/RandomBytesPseudoRandomStringGeneratorTest.php
+++ b/tests/PseudoRandomString/RandomBytesPseudoRandomStringGeneratorTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\PseudoRandomString;
 
 use Facebook\PseudoRandomString\RandomBytesPseudoRandomStringGenerator;
+use Facebook\Tests\BaseTestCase;
 
-class RandomBytesPseudoRandomStringGeneratorTest extends \PHPUnit_Framework_TestCase
+class RandomBytesPseudoRandomStringGeneratorTest extends BaseTestCase
 {
     public function testCanGenerateRandomStringOfArbitraryLength()
     {
diff --git a/tests/PseudoRandomString/UrandomPseudoRandomStringGeneratorTest.php b/tests/PseudoRandomString/UrandomPseudoRandomStringGeneratorTest.php
index e67136fe2..a5a9b82e0 100644
--- a/tests/PseudoRandomString/UrandomPseudoRandomStringGeneratorTest.php
+++ b/tests/PseudoRandomString/UrandomPseudoRandomStringGeneratorTest.php
@@ -24,8 +24,9 @@
 namespace Facebook\Tests\PseudoRandomString;
 
 use Facebook\PseudoRandomString\UrandomPseudoRandomStringGenerator;
+use Facebook\Tests\BaseTestCase;
 
-class UrandomPseudoRandomStringGeneratorTest extends \PHPUnit_Framework_TestCase
+class UrandomPseudoRandomStringGeneratorTest extends BaseTestCase
 {
     public function testCanGenerateRandomStringOfArbitraryLength()
     {
diff --git a/tests/SignedRequestTest.php b/tests/SignedRequestTest.php
index 119f27ce1..b94bdba03 100644
--- a/tests/SignedRequestTest.php
+++ b/tests/SignedRequestTest.php
@@ -26,7 +26,7 @@
 use Facebook\FacebookApp;
 use Facebook\SignedRequest;
 
-class SignedRequestTest extends \PHPUnit_Framework_TestCase
+class SignedRequestTest extends BaseTestCase
 {
     /**
      * @var FacebookApp
@@ -46,7 +46,7 @@ class SignedRequestTest extends \PHPUnit_Framework_TestCase
         'foo' => 'bar',
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->app = new FacebookApp('123', 'foo_app_secret');
     }
@@ -64,11 +64,9 @@ public function testAValidSignedRequestCanBeCreated()
         $this->assertEquals($this->payloadData, $payload);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testInvalidSignedRequestsWillFailFormattingValidation()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         new SignedRequest($this->app, 'invalid_signed_request');
     }
 
@@ -88,27 +86,21 @@ public function testAUrlSafeBase64EncodedStringCanBeDecoded()
         $this->assertEquals('aijkoprstADIJKLOPQTUVX1256!)]-:;"<>?.|~', $decodedData);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAnImproperlyEncodedSignatureWillThrowAnException()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         new SignedRequest($this->app, 'foo_sig.' . $this->rawPayload);
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testAnImproperlyEncodedPayloadWillThrowAnException()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         new SignedRequest($this->app, $this->rawSignature . '.foo_payload');
     }
 
-    /**
-     * @expectedException \Facebook\Exceptions\FacebookSDKException
-     */
     public function testNonApprovedAlgorithmsWillThrowAnException()
     {
+        $this->expectException(\Facebook\Exceptions\FacebookSDKException::class);
         $signedRequestData = $this->payloadData;
         $signedRequestData['algorithm'] = 'FOO-ALGORITHM';
 
diff --git a/tests/Url/FacebookUrlDetectionHandlerTest.php b/tests/Url/FacebookUrlDetectionHandlerTest.php
index b623c0524..3b9b010e7 100644
--- a/tests/Url/FacebookUrlDetectionHandlerTest.php
+++ b/tests/Url/FacebookUrlDetectionHandlerTest.php
@@ -23,9 +23,10 @@
  */
 namespace Facebook\Tests\Url;
 
+use Facebook\Tests\BaseTestCase;
 use Facebook\Url\FacebookUrlDetectionHandler;
 
-class FacebookUrlDetectionHandlerTest extends \PHPUnit_Framework_TestCase
+class FacebookUrlDetectionHandlerTest extends BaseTestCase
 {
     public function testProperlyGeneratesUrlFromCommonScenario()
     {
diff --git a/tests/Url/FacebookUrlManipulatorTest.php b/tests/Url/FacebookUrlManipulatorTest.php
index d92a2857a..2d7011dc5 100644
--- a/tests/Url/FacebookUrlManipulatorTest.php
+++ b/tests/Url/FacebookUrlManipulatorTest.php
@@ -23,9 +23,10 @@
  */
 namespace Facebook\Tests\Url;
 
+use Facebook\Tests\BaseTestCase;
 use Facebook\Url\FacebookUrlManipulator;
 
-class FacebookUrlManipulatorTest extends \PHPUnit_Framework_TestCase
+class FacebookUrlManipulatorTest extends BaseTestCase
 {
     /**
      * @dataProvider provideUris