diff --git a/.travis.yml b/.travis.yml
index 01344a6a..6b8cd3a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,29 @@
 sudo: false
 language: ruby
 before_script: 'bundle exec rake fixture:prepare'
-script: 'SPEC_OPTS="--format documentation" bundle exec rake spec'
+script: 'SPEC_OPTS="--format documentation -I $(puppet module list | head -n1)/filemapper/lib" bundle exec rake spec'
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1
 env:
-  - PUPPET_GEM_VERSION="~> 2.7"
-  - PUPPET_GEM_VERSION="~> 3.3"
-  - PUPPET_GEM_VERSION="~> 3.7"
+  - PUPPET_VERSION="~> 2.7"
+  - PUPPET_VERSION="~> 3.3"
+  - PUPPET_VERSION="~> 3.7"
+  - PUPPET_VERSION="~> 4"
 matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
+    - rvm: 1.8.7
+      env: PUPPET_VERSION="~> 4"
     - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7"
+      env: PUPPET_VERSION="~> 2.7"
     - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7"
+      env: PUPPET_VERSION="~> 2.7"
     - rvm: 2.1
-      env: PUPPET_GEM_VERSION="~> 2.7"
+      env: PUPPET_VERSION="~> 2.7"
   fast_finish: true
 notifications:
   email: false
diff --git a/README.markdown b/README.markdown
index 574316ac..1acc416f 100644
--- a/README.markdown
+++ b/README.markdown
@@ -3,7 +3,7 @@ puppet-network
 
 Manage non-volatile network and route configuration.
 
-Travis Test status: [![Build Status](https://travis-ci.org/puppet-community/puppet-network.png?branch=master)](https://travis-ci.org/puppet-community/puppet-network)
+Travis Test status: [![Build Status](https://travis-ci.org/jimpanic/puppet-network.png?branch=master)](https://travis-ci.org/jimpanic/puppet-network)
 
 Examples
 --------