diff --git a/Gemfile b/Gemfile
index 53422d9e86ea44d8417eb4e2dcfbd7514777025a..f0d7a49439b03929e9804e980e1f127da17d9a9f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
-  gem 'rake',                                              :require => false
+  gem 'rake', ' < 11.0',                                   :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
@@ -22,7 +22,6 @@ 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', '< 1.10.2',            :require => false if RUBY_VERSION !~ /^1\.8/
   gem 'puppet-blacksmith',                                 :require => false if RUBY_VERSION !~ /^1\./
 end
 
diff --git a/Rakefile b/Rakefile
index e204f0839b301058b5c58c26e78aab5137b91da5..61faa29845f3f56095666024bdfbd2cbdb4f5180 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,10 +14,10 @@ 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
+  #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/debian-6.yml b/spec/acceptance/nodesets/debian-6.yml
index 3e53be362282d62f9fdca117a4f998f1c606b228..d7b0275628cabb852f0483435c5fceca1f27fc90 100644
--- a/spec/acceptance/nodesets/debian-6.yml
+++ b/spec/acceptance/nodesets/debian-6.yml
@@ -5,7 +5,7 @@ HOSTS:
       strict_variables:
     platform: debian-6-amd64
     hypervisor : docker
-    image: debian:6
+    image: debian/eol:squeeze
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands: