diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index d8f5c59ef407b4a74d8ababefaab673d0ed826c4..e09d52f4f3b80ed303cb8dd270a772a51e52786c 100644
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1,5 +1,5 @@
 --fail-on-warnings
 --relative
---no-80chars
+--no-140chars
 --no-documentation
 --no-class_inherits_from_params_class-check
diff --git a/.travis.yml b/.travis.yml
index 65e0c88e9f20674407b4d6ad14e557cb79b2d9db..a9a9aa3a895db4026e1e0a9b1a1a3b01f88ca88e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,14 +5,14 @@ addons:
   apt:
     packages:
       - libaugeas-dev
+    sources:
+      - augeas
 cache: bundler
 bundler_args: --without system_tests
 script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"]
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
diff --git a/Gemfile b/Gemfile
index f0d7a49439b03929e9804e980e1f127da17d9a9f..c2dabeeeda4a4ed53f4e53b64800fa022d0eb81c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
-  gem 'rake', ' < 11.0',                                   :require => false if RUBY_VERSION =~ /^1\.8/
-  gem 'rspec', '< 3.2',                                    :require => false if RUBY_VERSION =~ /^1\.8/
+  gem 'rake',                                              :require => false
+  gem 'rspec',                                             :require => false
   gem 'rspec-puppet',                                      :require => false
   gem 'puppetlabs_spec_helper',                            :require => false
   gem 'metadata-json-lint',                                :require => false
@@ -17,12 +17,12 @@ group :development, :unit_tests do
   gem 'puppet-lint-trailing_comma-check',                  :require => false
   gem 'puppet-lint-file_ensure-check',                     :require => false
   gem 'puppet-lint-version_comparison-check',              :require => false
-  gem 'puppet-lint-fileserver-check',                      :require => false
   gem 'puppet-lint-file_source_rights-check',              :require => false
   gem 'puppet-lint-alias-check',                           :require => false
   gem 'rspec-puppet-facts',                                :require => false
   gem 'ruby-augeas',                                       :require => false
   gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1\./
+  gem 'json_pure', '< 2.0.2',                              :require => false
 end
 
 group :system_tests do
@@ -30,6 +30,7 @@ group :system_tests do
   gem 'beaker-rspec',        :require => false
   gem 'beaker_spec_helper',  :require => false
   gem 'serverspec',          :require => false
+  gem 'specinfra',           :require => false
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index 61faa29845f3f56095666024bdfbd2cbdb4f5180..aa7b8a150a301e6aaa965e47c50d4149ed6acee3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ require 'puppet-lint/tasks/puppet-lint'
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
   config.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
-  config.disable_checks = ['80chars']
+  config.disable_checks = ['140chars']
   config.fail_on_warnings = true
 end
 
@@ -14,10 +14,4 @@ PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
 unless RUBY_VERSION =~ /^1\./
   require 'puppet_blacksmith'
   require 'puppet_blacksmith/rake_tasks'
-  #require 'github_changelog_generator/task'
-  #GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  #  m = Blacksmith::Modulefile.new
-  #  config.future_release = m.version
-  #  config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
-  #end
 end
diff --git a/spec/acceptance/nodesets/centos-5.yml b/spec/acceptance/nodesets/centos-5.yml
index b7ed0e50887aa5f5e0c5e67246a5ca784e70ceac..a26f27fc6e27a6d3da706fef05848da01fc14e5f 100644
--- a/spec/acceptance/nodesets/centos-5.yml
+++ b/spec/acceptance/nodesets/centos-5.yml
@@ -10,6 +10,7 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       - 'yum install -y crontabs tar wget which'
+      - 'sed -i -e "/mingetty/d" /etc/inittab'
 CONFIG:
   type: aio
   log_level: debug
diff --git a/spec/acceptance/nodesets/centos-6.yml b/spec/acceptance/nodesets/centos-6.yml
index c82c10de40e557069471b22742a574b2a3848969..71e23cd8149eef986755403bbc7baa46981fe8a6 100644
--- a/spec/acceptance/nodesets/centos-6.yml
+++ b/spec/acceptance/nodesets/centos-6.yml
@@ -11,6 +11,7 @@ HOSTS:
     docker_image_commands:
       - 'rm -rf /var/run/network/*'
       - 'yum install -y crontabs tar wget'
+      - 'rm /etc/init/tty.conf'
 CONFIG:
   type: aio
   log_level: debug