diff --git a/.travis.yml b/.travis.yml
index 602cad7..dd8b022 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 ---
-branches:
-  only:
-    - master
 language: ruby
 bundler_args: --without development
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
diff --git a/Gemfile b/Gemfile
index 6922b50..13ecab1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,10 @@ group :development, :test do
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
+  # rspec must be v2 for ruby 1.8.7
+  if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
+    gem 'rspec', '~> 2.0',         :require => false
+  end
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']