diff --git a/Gemfile b/Gemfile
index f3182fde..66679e37 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,18 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint', '~> 0.3.2'
   gem 'rspec-puppet', '~> 1.0.1'
+  gem 'puppet-lint', '~> 1.1.0'
+  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-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-numericvariable'
+
   gem 'rake', '10.1.1'
   gem 'rspec', '< 2.99'
   gem 'json'
diff --git a/manifests/api.pp b/manifests/api.pp
index fe16fff3..d5a12cf3 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -221,7 +221,7 @@ class glance::api(
   $mysql_module             = undef,
 ) inherits glance {
 
-  include glance::policy
+  include ::glance::policy
   require keystone::python
 
   if $mysql_module {
diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp
index a19324f4..1e082c0f 100644
--- a/manifests/backend/rbd.pp
+++ b/manifests/backend/rbd.pp
@@ -27,7 +27,7 @@ class glance::backend::rbd(
   $show_image_direct_url  = undef,
   $package_ensure         = 'present',
 ) {
-  include glance::params
+  include ::glance::params
 
   if $show_image_direct_url {
     notice('parameter show_image_direct_url is deprecated, use parameter in glance::api')
diff --git a/manifests/cache/cleaner.pp b/manifests/cache/cleaner.pp
index f05258db..3ac2226d 100644
--- a/manifests/cache/cleaner.pp
+++ b/manifests/cache/cleaner.pp
@@ -33,7 +33,7 @@ class glance::cache::cleaner (
   $command_options  = '',
 ) {
 
-  include glance::params
+  include ::glance::params
 
   cron { 'glance-cache-cleaner':
     command     => "${glance::params::cache_cleaner_command} ${command_options}",
diff --git a/manifests/cache/pruner.pp b/manifests/cache/pruner.pp
index 96e135fb..cdff8494 100644
--- a/manifests/cache/pruner.pp
+++ b/manifests/cache/pruner.pp
@@ -33,7 +33,7 @@ class glance::cache::pruner (
   $command_options  = '',
 ) {
 
-  include glance::params
+  include ::glance::params
 
   cron { 'glance-cache-pruner':
     command     => "${glance::params::cache_pruner_command} ${command_options}",
diff --git a/manifests/client.pp b/manifests/client.pp
index cbb0f1c0..dd5f4c7d 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -8,7 +8,7 @@ class glance::client (
   $ensure = 'present'
 ) {
 
-  include glance::params
+  include ::glance::params
 
   package { 'python-glanceclient':
     ensure => $ensure,
diff --git a/manifests/init.pp b/manifests/init.pp
index 200cb811..74f03456 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -8,13 +8,13 @@ class glance(
   $package_ensure = 'present'
 ) {
 
-  include glance::params
+  include ::glance::params
 
   file { '/etc/glance/':
-    ensure  => directory,
-    owner   => 'glance',
-    group   => 'root',
-    mode    => '0770',
+    ensure => directory,
+    owner  => 'glance',
+    group  => 'root',
+    mode   => '0770',
   }
 
   if ( $glance::params::api_package_name == $glance::params::registry_package_name ) {
diff --git a/tests/api.pp b/tests/api.pp
index 7b493191..eba47007 100644
--- a/tests/api.pp
+++ b/tests/api.pp
@@ -1,4 +1,4 @@
-class { 'glance::api':
+class { '::glance::api':
   debug   => true,
   verbose => true,
 }
diff --git a/tests/init.pp b/tests/init.pp
index 57cf401a..776103dd 100644
--- a/tests/init.pp
+++ b/tests/init.pp
@@ -1 +1 @@
-class { 'glance': }
+class { '::glance': }
diff --git a/tests/registry.pp b/tests/registry.pp
index 8635cb26..52a2d1ce 100644
--- a/tests/registry.pp
+++ b/tests/registry.pp
@@ -1,4 +1,4 @@
-class { 'glance::registry':
+class { '::glance::registry':
   debug   => true,
   verbose => true,
 }
diff --git a/tests/site.pp b/tests/site.pp
index 1d69bcf6..7c3edb74 100644
--- a/tests/site.pp
+++ b/tests/site.pp
@@ -4,21 +4,21 @@
 Exec { logoutput => 'on_failure' }
 
 node glance_keystone_mysql {
-  class { 'mysql::server': }
-  class { 'keystone':
+  class { '::mysql::server': }
+  class { '::keystone':
     verbose      => true,
     debug        => true,
     catalog_type => 'sql',
     admin_token  => 'admin_token',
   }
-  class { 'keystone::db::mysql':
+  class { '::keystone::db::mysql':
     password => 'keystone',
   }
-  class { 'keystone::roles::admin':
+  class { '::keystone::roles::admin':
     email    => 'test@puppetlabs.com',
     password => 'ChangeMe',
   }
-  class { 'glance::api':
+  class { '::glance::api':
     verbose             => true,
     debug               => true,
     auth_type           => 'keystone',
@@ -27,9 +27,9 @@ node glance_keystone_mysql {
     keystone_password   => 'glance_password',
     database_connection => 'mysql://glance:glance@127.0.0.1/glance',
   }
-  class { 'glance::backend::file': }
+  class { '::glance::backend::file': }
 
-  class { 'glance::db::mysql':
+  class { '::glance::db::mysql':
     password => 'glance',
     dbname   => 'glance',
     user     => 'glance',
@@ -38,7 +38,7 @@ node glance_keystone_mysql {
     # $cluster_id = 'localzone'
   }
 
-  class { 'glance::registry':
+  class { '::glance::registry':
     verbose             => true,
     debug               => true,
     auth_type           => 'keystone',
@@ -47,7 +47,7 @@ node glance_keystone_mysql {
     keystone_password   => 'glance_password',
     database_connection => 'mysql://glance:glance@127.0.0.1/glance',
   }
-  class { 'glance::keystone::auth':
+  class { '::glance::keystone::auth':
     password => 'glance_pass',
   }
 }