diff --git a/.travis.yml b/.travis.yml
index 3eb1369174a47061cae90caa0a39a15e9d70af44..37e02b3317413b4eb92a7645382f4eb48bcf099c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,46 +19,53 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.6
+  - rvm: 2.1.7
     env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="debian-6-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="debian-7-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="debian-8-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="ubuntu-12.04-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="ubuntu-14.04-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="centos-6-x86_64-docker"
     bundler_args:
     script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
   - rvm: default
     sudo: required
+    dist: trusty
     services: docker
     env: BEAKER_set="centos-7-x86_64-docker"
     bundler_args:
@@ -75,4 +82,4 @@ deploy:
     # all_branches is required to use tags
     all_branches: true
     # Only publish if our main Ruby target builds
-    rvm: 1.9.3
+    rvm: 2.1.7
diff --git a/Gemfile b/Gemfile
index 1d5497f10b006c73fe8533ca8ae9b8dfd76d8199..bdaa6ca833d67a46fdd0073369821960df009f6a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
   gem 'rake',                                              :require => false
-  gem 'rspec', '< 3.2',                                    :require => false if RUBY_VERSION =~ /^1.8/
+  gem 'rspec', '< 3.2',                                    :require => false if RUBY_VERSION =~ /^1\.8/
   gem 'rspec-puppet',                                      :require => false
   gem 'puppetlabs_spec_helper',                            :require => false
   gem 'metadata-json-lint',                                :require => false
@@ -22,8 +22,8 @@ group :development, :unit_tests do
   gem 'puppet-lint-alias-check',                           :require => false
   gem 'rspec-puppet-facts',                                :require => false
   gem 'ruby-augeas',                                       :require => false
-  gem 'github_changelog_generator',                        :require => false if RUBY_VERSION !~ /^1.8/
-  gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1.8/
+  gem 'github_changelog_generator',                        :require => false if RUBY_VERSION !~ /^1\.8/
+  gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1\./
 end
 
 group :system_tests do
diff --git a/Rakefile b/Rakefile
index adcac180c18512c5e636dfb6793dc633d4da9fa0..e204f0839b301058b5c58c26e78aab5137b91da5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,7 +11,7 @@ end
 PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
 
 # Publishing tasks
-unless RUBY_VERSION =~ /^1\.8/
+unless RUBY_VERSION =~ /^1\./
   require 'puppet_blacksmith'
   require 'puppet_blacksmith/rake_tasks'
   require 'github_changelog_generator/task'