diff --git a/Rakefile b/Rakefile
index f4a0938542..15f44f8d00 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,3 +3,6 @@ require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('disable_80chars')
+
+# Disable check due to upstream bug: https://github.com/rodjek/puppet-lint/issues/170
+PuppetLint.configuration.send('disable_class_parameter_defaults')
diff --git a/modules/etherpad_lite/manifests/init.pp b/modules/etherpad_lite/manifests/init.pp
index f7a724ac44..75ec30cd16 100644
--- a/modules/etherpad_lite/manifests/init.pp
+++ b/modules/etherpad_lite/manifests/init.pp
@@ -46,7 +46,7 @@ class etherpad_lite (
     revision => $nodejs_version,
     require  => [
         Package['git'],
-        File["${base_install_dir}"],
+        File[$base_install_dir],
     ],
   }
 
diff --git a/modules/gerrit/manifests/init.pp b/modules/gerrit/manifests/init.pp
index 9305e93aca..cff9967d90 100644
--- a/modules/gerrit/manifests/init.pp
+++ b/modules/gerrit/manifests/init.pp
@@ -65,7 +65,7 @@
 #     Set this to true to disable cron jobs and replication,
 #     which can interfere with testing.
 # TODO: make more gerrit options configurable here
-
+#
 class gerrit(
   $war = '',
   $mysql_password = '',
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index bed9997927..089985f741 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -66,8 +66,8 @@ class openstack_project::gerrit (
     vhost_name                      => $vhost_name,
     canonicalweburl                 => $canonicalweburl,
     # opinions
-    enable_melody                   => 'true',
-    melody_session                  => 'true',
+    enable_melody                   => true,
+    melody_session                  => true,
     # passthrough
     ssl_cert_file                   => $ssl_cert_file,
     ssl_key_file                    => $ssl_key_file,
diff --git a/modules/pip/manifests/init.pp b/modules/pip/manifests/init.pp
index f10f34ed8c..17108bd175 100644
--- a/modules/pip/manifests/init.pp
+++ b/modules/pip/manifests/init.pp
@@ -1,12 +1,12 @@
+# Class: pip
+#
 class pip {
-
-  package { "python-all-dev":
-    ensure => present
-  }
-
-  package { "python-pip":
+  package { 'python-all-dev':
     ensure => present,
-    require => Package[python-all-dev]
   }
 
+  package { 'python-pip':
+    ensure  => present,
+    require => Package['python-all-dev'],
+  }
 }