diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..987e2a2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+composer.lock
+vendor
diff --git a/.travis.yml b/.travis.yml
index 70a6fed..11ab0f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,16 @@
 language: php
-
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - hhvm
-  - hhvm-nightly
+dist: trusty
+sudo: required
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
+  include:
+    - php: 5.3
+      dist: precise
+    - php: 5.4
+    - php: 5.5
+    - php: 5.6
+    - php: 7.0
+    - php: 7.1
 
 install:
   - composer install
@@ -20,7 +20,8 @@ before_script:
   - cd tests
 
 script:
-  - phpunit --colors --coverage-clover /home/travis/build/joshtronic/php-googleplaces/build/logs/clover.xml .
+  - phpunit --colors --coverage-clover ../build/logs/clover.xml .
 
 after_success:
-  - php ../vendor/bin/coveralls --config ../.coveralls.yml -v
+  - cd ..
+  - php vendor/bin/coveralls --config .coveralls.yml -v
diff --git a/FUNDING.yml b/FUNDING.yml
deleted file mode 100644
index 9396c28..0000000
--- a/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-github: joshtronic
diff --git a/README.md b/README.md
index 9e2a217..c95972d 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,8 @@
 # php-googleplaces
 
-[![Build Status](http://img.shields.io/travis/joshtronic/php-googleplaces.svg?style=flat)][travis]
-[![Coverage Status](http://img.shields.io/coveralls/joshtronic/php-googleplaces.svg?style=flat)][coveralls]
-[![Downloads](http://img.shields.io/packagist/dm/joshtronic/php-googleplaces.svg?style=flat)][packagist]
-[![Gittip](http://img.shields.io/gittip/joshtronic.svg?style=flat)][gittip]
-
-[travis]:    http://travis-ci.org/joshtronic/php-googleplaces
-[coveralls]: https://coveralls.io/r/joshtronic/php-googleplaces
-[packagist]: https://packagist.org/packages/joshtronic/php-googleplaces
-[gittip]:    https://www.gittip.com/joshtronic/
+[![Build Status](https://travis-ci.org/joshtronic/php-googleplaces.svg?branch=master)](https://travis-ci.org/joshtronic/php-googleplaces)
+[![Coverage Status](https://coveralls.io/repos/github/joshtronic/php-googleplaces/badge.svg?branch=master)](https://coveralls.io/github/joshtronic/php-googleplaces?branch=master)
+[![Total Downloads](https://poser.pugx.org/joshtronic/php-googleplaces/downloads)](https://packagist.org/packages/joshtronic/php-googleplaces)
 
 PHP Wrapper for the Google Places API.
 
diff --git a/composer.json b/composer.json
index 148b173..68ed572 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "satooshi/php-coveralls": "dev-master"
+        "satooshi/php-coveralls": "1.0.*"
     },
     "autoload": {
         "psr-4": {"joshtronic\\": "src/"}
diff --git a/tests/GooglePlacesTest.php b/tests/GooglePlacesTest.php
index 2d0b401..241aeea 100644
--- a/tests/GooglePlacesTest.php
+++ b/tests/GooglePlacesTest.php
@@ -3,6 +3,10 @@
 require_once '../src/GooglePlaces.php';
 require_once '../src/GooglePlacesClient.php';
 
+if (!class_exists('\PHPUnit_Framework_TestCase') && class_exists('\PHPUnit\Framework\TestCase')) {
+    class_alias('\PHPUnit\Framework\TestCase', '\PHPUnit_Framework_TestCase');
+}
+
 class GooglePlacesTest extends PHPUnit_Framework_TestCase
 {
     private $places;
@@ -15,7 +19,11 @@ class GooglePlacesTest extends PHPUnit_Framework_TestCase
 
     private function clientSetUp($next = false)
     {
-        $client = $this->getMock('GooglePlacesClient', array('get'));
+        if (version_compare(PHPUnit_Runner_Version::id(), '5.4', '<=')) {
+            $client = $this->getMock('GooglePlacesClient', array('get'));
+        } else {
+            $client = $this->createMock('GooglePlacesClient');
+        }
 
         $client
             ->expects($this->once())