diff --git a/acceptance/lib/puppet/acceptance/install_utils.rb b/acceptance/lib/puppet/acceptance/install_utils.rb
index 5df423574..ed3174f9b 100644
--- a/acceptance/lib/puppet/acceptance/install_utils.rb
+++ b/acceptance/lib/puppet/acceptance/install_utils.rb
@@ -1,155 +1,156 @@
 require 'open-uri'
 
 module Puppet
   module Acceptance
     module InstallUtils
       PLATFORM_PATTERNS = {
-        :redhat  => /fedora|el|centos/,
-        :debian  => /debian|ubuntu/,
-        :solaris => /solaris/,
-        :windows => /windows/,
+        :redhat        => /fedora|el|centos/,
+        :debian        => /debian|ubuntu/,
+        :debian_ruby18 => /debian|ubuntu-lucid|ubuntu-precise/,
+        :solaris       => /solaris/,
+        :windows       => /windows/,
       }.freeze
 
       # Installs packages on the hosts.
       #
       # @param hosts [Array<Host>] Array of hosts to install packages to.
       # @param package_hash [Hash{Symbol=>Array<String,Array<String,String>>}]
       #   Keys should be a symbol for a platform in PLATFORM_PATTERNS.  Values
       #   should be an array of package names to install, or of two element
       #   arrays where a[0] is the command we expect to find on the platform
       #   and a[1] is the package name (when they are different).
       # @param options [Hash{Symbol=>Boolean}]
       # @option options [Boolean] :check_if_exists First check to see if
       #   command is present before installing package.  (Default false)
       # @return true
       def install_packages_on(hosts, package_hash, options = {})
         check_if_exists = options[:check_if_exists]
         hosts = [hosts] unless hosts.kind_of?(Array)
         hosts.each do |host|
           package_hash.each do |platform_key,package_list|
             if pattern = PLATFORM_PATTERNS[platform_key]
               if pattern.match(host['platform'])
                 package_list.each do |cmd_pkg|
                   if cmd_pkg.kind_of?(Array)
                     command, package = cmd_pkg
                   else
                     command = package = cmd_pkg
                   end
                   if !check_if_exists || !host.check_for_package(command)
                     host.logger.notify("Installing #{package}")
                     additional_switches = '--allow-unauthenticated' if platform_key == :debian
                     host.install_package(package, additional_switches)
                   end
                 end
               end
             else
               raise("Unknown platform '#{platform_key}' in package_hash")
             end
           end
         end
         return true
       end
 
       def fetch(base_url, file_name, dst_dir)
         FileUtils.makedirs(dst_dir)
         src = "#{base_url}/#{file_name}"
         dst = File.join(dst_dir, file_name)
         if File.exists?(dst)
           logger.notify "Already fetched #{dst}"
         else
           logger.notify "Fetching: #{src}"
           logger.notify "  and saving to #{dst}"
           open(src) do |remote|
             File.open(dst, "w") do |file|
               FileUtils.copy_stream(remote, file)
             end
           end
         end
         return dst
       end
 
       def stop_firewall_on(host)
         case host['platform']
         when /debian/
           on host, 'iptables -F'
         when /fedora|el-7/
           on host, puppet('resource', 'service', 'firewalld', 'ensure=stopped')
         when /el|centos/
           on host, puppet('resource', 'service', 'iptables', 'ensure=stopped')
         when /ubuntu/
           on host, puppet('resource', 'service', 'ufw', 'ensure=stopped')
         else
           logger.notify("Not sure how to clear firewall on #{host['platform']}")
         end
       end
 
       def install_repos_on(host, sha, repo_configs_dir)
         platform = host['platform']
         platform_configs_dir = File.join(repo_configs_dir,platform)
 
         case platform
           when /^(fedora|el|centos)-(\d+)-(.+)$/
             variant = (($1 == 'centos') ? 'el' : $1)
             fedora_prefix = ((variant == 'fedora') ? 'f' : '')
             version = $2
             arch = $3
 
             rpm = fetch(
               "http://yum.puppetlabs.com",
               "puppetlabs-release-%s-%s.noarch.rpm" % [variant, version],
               platform_configs_dir
             )
 
             pattern = "pl-puppet-%s-%s-%s%s-%s.repo"
             repo_filename = pattern % [
               sha,
               variant,
               fedora_prefix,
               version,
               arch
             ]
             repo = fetch(
               "http://builds.puppetlabs.lan/puppet/%s/repo_configs/rpm/" % sha,
               repo_filename,
               platform_configs_dir
             )
 
             on host, "rm -rf /root/*.repo; rm -rf /root/*.rpm"
 
             scp_to host, rpm, '/root'
             scp_to host, repo, '/root'
 
             on host, "mv /root/*.repo /etc/yum.repos.d"
             on host, "rpm -Uvh --force /root/*.rpm"
 
           when /^(debian|ubuntu)-([^-]+)-(.+)$/
             variant = $1
             version = $2
             arch = $3
 
             deb = fetch(
               "http://apt.puppetlabs.com/",
               "puppetlabs-release-%s.deb" % version,
               platform_configs_dir
             )
 
             list = fetch(
               "http://builds.puppetlabs.lan/puppet/%s/repo_configs/deb/" % sha,
               "pl-puppet-%s-%s.list" % [sha, version],
               platform_configs_dir
             )
 
             on host, "rm -rf /root/*.list; rm -rf /root/*.deb"
 
             scp_to host, deb, '/root'
             scp_to host, list, '/root'
 
             on host, "mv /root/*.list /etc/apt/sources.list.d"
             on host, "dpkg -i --force-all /root/*.deb"
           else
             host.logger.notify("No repository installation step for #{platform} yet...")
         end
       end
     end
   end
 end
diff --git a/acceptance/setup/git/pre-suite/000_EnvSetup.rb b/acceptance/setup/git/pre-suite/000_EnvSetup.rb
index 0c090d923..610a0eceb 100644
--- a/acceptance/setup/git/pre-suite/000_EnvSetup.rb
+++ b/acceptance/setup/git/pre-suite/000_EnvSetup.rb
@@ -1,53 +1,55 @@
 test_name "Setup environment"
 
 step "Ensure Git and Ruby"
 
 require 'puppet/acceptance/install_utils'
 extend Puppet::Acceptance::InstallUtils
 require 'puppet/acceptance/git_utils'
 extend Puppet::Acceptance::GitUtils
 require 'beaker/dsl/install_utils'
 extend Beaker::DSL::InstallUtils
 
 PACKAGES = {
   :redhat => [
     'git',
     'ruby',
     'rubygem-json',
   ],
   :debian => [
     ['git', 'git-core'],
     'ruby',
+  ],
+  :debian_ruby18 => [
     'libjson-ruby',
   ],
   :solaris => [
     ['git', 'developer/versioning/git'],
     ['ruby', 'runtime/ruby-18'],
     # there isn't a package for json, so it is installed later via gems
   ],
   :windows => [
     'git',
     # there isn't a need for json on windows because it is bundled in ruby 1.9
   ],
 }
 
 install_packages_on(hosts, PACKAGES, :check_if_exists => true)
 
 hosts.each do |host|
   case host['platform']
   when /windows/
     step "#{host} Install ruby from git"
     # TODO remove this step once we are installing puppet from msi packages
     install_from_git(host, "/opt/puppet-git-repos",
                      :name => 'puppet-win32-ruby',
                      :path => build_giturl('puppet-win32-ruby'))
     on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
     on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"'
     on host, 'cd /lib; icacls ruby /reset /T'
     on host, 'ruby --version'
     on host, 'cmd /c gem list'
   when /solaris/
     step "#{host} Install json from rubygems"
     on host, 'gem install json'
   end
 end