diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dade81e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.bundled_gems/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..b9cb68a
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,32 @@
+source 'https://rubygems.org'
+
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+
+  gem 'metadata-json-lint'
+  # This is nice and all, but let's not worry about it until we've actually
+  # got puppet 4.x sorted
+  # gem 'puppet-lint-param-docs'
+  gem 'puppet-lint-absolute_classname-check'
+  gem 'puppet-lint-absolute_template_path'
+  gem 'puppet-lint-trailing_newline-check'
+
+  # Puppet 4.x related lint checks
+  gem 'puppet-lint-unquoted_string-check'
+  #The puppet-gerrit module makes too much use of empty string defaults
+  #so disable this check for now
+  #gem 'puppet-lint-empty_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-spaceship_operator_without_tag-check'
+  gem 'puppet-lint-undef_in_function-check'
+
+  if puppetversion = ENV['PUPPET_GEM_VERSION']
+    gem 'puppet', puppetversion, :require => false
+  else
+    gem 'puppet', '~> 3.0', :require => false
+  end
+
+end
+
+# vim:ft=ruby
diff --git a/manifests/cron.pp b/manifests/cron.pp
index 8ed54e6..bb7ee98 100644
--- a/manifests/cron.pp
+++ b/manifests/cron.pp
@@ -12,13 +12,13 @@ class gerrit::cron {
   }
 
   cron { 'expireoldreviews':
-    ensure      => 'absent',
-    user        => 'gerrit2',
+    ensure => 'absent',
+    user   => 'gerrit2',
   }
 
   cron { 'removedbdumps':
-    ensure      => 'absent',
-    user        => 'gerrit2',
+    ensure => 'absent',
+    user   => 'gerrit2',
   }
 
   cron { 'clear_gerrit_logs':
diff --git a/manifests/init.pp b/manifests/init.pp
index f179294..142a819 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -161,8 +161,8 @@ class gerrit(
   $enable_javamelody_top_menu = false,
 ) {
   include ::httpd
-  include jeepyb
-  include pip
+  include ::jeepyb
+  include ::pip
 
   $java_home = $::lsbdistcodename ? {
     'precise' => '/usr/lib/jvm/java-7-openjdk-amd64/jre',
@@ -180,7 +180,7 @@ class gerrit(
   $gerrit_war = '/home/gerrit2/review_site/bin/gerrit.war'
   $gerrit_site = '/home/gerrit2/review_site'
 
-  include gerrit::user
+  include ::gerrit::user
 
   if ($gitweb) {
     package { 'gitweb':
@@ -408,11 +408,11 @@ class gerrit(
 
   if $robots_txt_source != '' {
     file { '/home/gerrit2/review_site/static/robots.txt':
-      owner    => 'root',
-      group    => 'root',
-      mode     => '0444',
-      source   => $robots_txt_source,
-      require  => File['/home/gerrit2/review_site/static'],
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0444',
+      source  => $robots_txt_source,
+      require => File['/home/gerrit2/review_site/static'],
     }
   }
 
@@ -672,10 +672,10 @@ class gerrit(
     ensure => present,
   }
   file { '/home/gerrit2/review_site/lib/mysql-connector-java.jar':
-    ensure   => link,
-    target   => '/usr/share/java/mysql-connector-java.jar',
-    before   => Exec['gerrit-start'],
-    require  => [
+    ensure  => link,
+    target  => '/usr/share/java/mysql-connector-java.jar',
+    before  => Exec['gerrit-start'],
+    require => [
       Package['libmysql-java'],
       File['/home/gerrit2/review_site/lib'],
     ],
@@ -730,10 +730,10 @@ class gerrit(
         ensure => present,
       }
       file { '/home/gerrit2/review_site/lib/bcpkix.jar':
-        ensure   => link,
-        target   => '/usr/share/java/bcpkix.jar',
-        before   => Exec['gerrit-start'],
-        require  => [
+        ensure  => link,
+        target  => '/usr/share/java/bcpkix.jar',
+        before  => Exec['gerrit-start'],
+        require => [
           Package['libbcpkix-java'],
           File['/home/gerrit2/review_site/lib'],
         ],
@@ -756,10 +756,10 @@ class gerrit(
         ensure => present,
       }
       file { '/home/gerrit2/review_site/lib/bcpg.jar':
-        ensure   => link,
-        target   => '/usr/share/java/bcpg.jar',
-        before   => Exec['gerrit-start'],
-        require  => [
+        ensure  => link,
+        target  => '/usr/share/java/bcpg.jar',
+        before  => Exec['gerrit-start'],
+        require => [
           Package['libbcpg-java'],
           File['/home/gerrit2/review_site/lib'],
         ],
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 21f71e6..8899323 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -7,14 +7,14 @@ class gerrit::mysql(
   $database_password = '',
 ) {
 
-  class { 'mysql::server':
+  class { '::mysql::server':
     config_hash => {
       'root_password'  => $mysql_root_password,
       'default_engine' => 'InnoDB',
       'bind_address'   => '127.0.0.1',
     }
   }
-  include mysql::server::account_security
+  include ::mysql::server::account_security
 
   mysql::db { $database_name:
     user     => $database_user,
diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index 828a598..3972346 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -27,7 +27,7 @@ define gerrit::plugin(
   $plugin_parent_dir = '/home/gerrit2/review_site'
   $base_url          = "http://tarballs.openstack.org/ci/gerrit/plugins/${name}"
 
-  include gerrit::user
+  include ::gerrit::user
 
   # This directory is used to download and cache gerrit plugin files.
   # That way the download and install steps are kept separate.
@@ -68,11 +68,11 @@ define gerrit::plugin(
   }
 
   exec { "install-${base_plugin}":
-    command  => "cp ${plugin_cache_dir}/${plugin} ${plugin_dir}/${base_plugin}",
-    path     => ['/bin','/usr/bin', '/usr/sbin', '/usr/local/bin'],
-    require  => Exec["download-${plugin}"],
-    user     => 'gerrit2',
-    unless   => "test -f ${plugin_dir}/${base_plugin}",
+    command => "cp ${plugin_cache_dir}/${plugin} ${plugin_dir}/${base_plugin}",
+    path    => ['/bin','/usr/bin', '/usr/sbin', '/usr/local/bin'],
+    require => Exec["download-${plugin}"],
+    user    => 'gerrit2',
+    unless  => "test -f ${plugin_dir}/${base_plugin}",
   }
 
 }
diff --git a/manifests/remotes.pp b/manifests/remotes.pp
index 1a566c8..6aae961 100644
--- a/manifests/remotes.pp
+++ b/manifests/remotes.pp
@@ -4,7 +4,7 @@ class gerrit::remotes($ensure=present) {
     file { '/home/gerrit2/remotes.config':
       ensure => absent,
     }
-    class { 'jeepyb::fetch_remotes':
+    class { '::jeepyb::fetch_remotes':
       ensure => $ensure,
     }
 }