diff --git a/.travis.yml b/.travis.yml
index 6025291..03e7094 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,11 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
+  - '5.6'
+  - '7.0'
+  - '7.1'
 
 before_script:
-  - wget http://getcomposer.org/composer.phar
-  - php composer.phar install
+  - composer install
 
-script: phpunit --coverage-text
+script: phpunit
diff --git a/tests/PageSpeed/Tests/Insights/ServiceTest.php b/tests/PageSpeed/Tests/Insights/ServiceTest.php
index 1c9c538..c5fb9dc 100644
--- a/tests/PageSpeed/Tests/Insights/ServiceTest.php
+++ b/tests/PageSpeed/Tests/Insights/ServiceTest.php
@@ -2,20 +2,23 @@
 
 namespace PageSpeed\Tests\Insights;
 
-class ServiceTest extends \PageSpeed\Tests\PageSpeedTestCase
+use PageSpeed\Insights\Service;
+use PageSpeed\Tests\PageSpeedTestCase;
+
+class ServiceTest extends PageSpeedTestCase
 {
 	/**
-	 * @expectedException InvalidArgumentException
+	 * @expectedException \InvalidArgumentException
 	 */
 	public function testInvalidUrl()
 	{
-		$pageSpeed = new \PageSpeed\Insights\Service();
+		$pageSpeed = new Service();
 		$pageSpeed->getResults('localhost');
 	}
 
 	public function testResults()
 	{
-		$pageSpeed = new \PageSpeed\Insights\Service();
+		$pageSpeed = new Service();
 		$url       = 'https://github.com/sgrodzicki/pagespeed';
 		$results   = $pageSpeed->getResults($url);
 
@@ -26,8 +29,7 @@ public function testResults()
 
 		$this->assertEquals($url, $results['id']);
 		$this->assertEquals(200, $results['responseCode']);
-		$this->assertStringStartsWith('sgrodzicki/pagespeed', $results['title']);
-		$this->assertStringEndsWith('GitHub', $results['title']);
+		$this->assertEquals('GitHub - sgrodzicki/pagespeed: A PHP library to interact with the PageSpeed Insights API', $results['title']);
 		$this->assertTrue(is_array($results['pageStats']));
 		$this->assertTrue(is_array($results['formattedResults']));
 		$this->assertTrue(is_array($results['version']));
diff --git a/tests/PageSpeed/Tests/PageSpeedTestCase.php b/tests/PageSpeed/Tests/PageSpeedTestCase.php
index d0c0a3e..3fb8b2a 100644
--- a/tests/PageSpeed/Tests/PageSpeedTestCase.php
+++ b/tests/PageSpeed/Tests/PageSpeedTestCase.php
@@ -2,7 +2,9 @@
 
 namespace PageSpeed\Tests;
 
-abstract class PageSpeedTestCase extends \PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+abstract class PageSpeedTestCase extends TestCase
 {
 
 }