diff --git a/.gitignore b/.gitignore
index e6122c7..08dd181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ coverage/
 spec/fixtures/modules/*
 spec/fixtures/manifests/*
 Gemfile.lock
+vendor/*
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..49d5710
--- /dev/null
+++ b/.rspec
@@ -0,0 +1 @@
+--format documentation
diff --git a/.travis.yml b/.travis.yml
index 461a7e4..1fb1642 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,24 +4,17 @@ language: ruby
 cache: bundler
 
 before_install:
-  - bundle -v
   - rm Gemfile.lock || true
-  - gem update --system
-  - gem update bundler
   - gem --version
   - bundle -v
 
 sudo: false
 
-script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
+script: 'bundle exec rake validate lint spec'
 
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3"
   - rvm: 1.9.3
@@ -38,8 +31,22 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 4"
   - rvm: 2.4.1
     env: PUPPET_GEM_VERSION="~> 5"
+    before_install:
+      - bundle -v
+      - rm Gemfile.lock || true
+      - gem update --system --no-doc
+      - gem update bundler --no-doc
+      - gem --version
+      - bundle -v
   - rvm: 2.5.1
     env: PUPPET_GEM_VERSION="~> 6"
+    before_install:
+      - bundle -v
+      - rm Gemfile.lock || true
+      - gem update --system --no-doc
+      - gem update bundler --no-doc
+      - gem --version
+      - bundle -v
 
 notifications:
   email: false