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..96912da
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,30 @@
+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'
+  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/init.pp b/manifests/init.pp
index f344736..18660b7 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,14 +17,14 @@
 #
 class subunit2sql (
 ) {
-  include pip
+  include ::pip
 
   package {'python-mysqldb':
-    ensure   => present,
+    ensure => present,
   }
 
   package {'python-psycopg2':
-    ensure   => present,
+    ensure => present,
   }
 
   package { 'python-subunit':
diff --git a/manifests/worker.pp b/manifests/worker.pp
index 735d1e5..c4a4344 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -68,19 +68,19 @@ define subunit2sql::worker (
   }
 
   service { "jenkins-subunit-worker${suffix}":
-    enable      => true,
-    hasrestart  => true,
-    subscribe   => [
+    enable     => true,
+    hasrestart => true,
+    subscribe  => [
       File["/etc/logstash/jenkins-subunit-worker${suffix}.yaml"],
       Package['subunit2sql'],
     ],
-    require     => [
+    require    => [
       File['/etc/logstash'],
       File["/etc/init.d/jenkins-subunit-worker${suffix}"],
     ],
   }
 
-  include logrotate
+  include ::logrotate
   logrotate::file { "subunit-worker${suffix}-debug.log":
     log     => "/var/log/logstash/subunit-worker${suffix}-debug.log",
     options => [