diff --git a/.travis.yml b/.travis.yml
index 5b53a88..2ca0297 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.3.1
 
 env:
   matrix:
@@ -17,13 +18,14 @@ env:
     - PUPPET_GEM_VERSION="~> 3.6.0"
     - PUPPET_GEM_VERSION="~> 3.7.0"
     - PUPPET_GEM_VERSION="~> 3.8.0"
-    - PUPPET_GEM_VERSION="~> 3" PARSER="future"
+    - PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
     - PUPPET_GEM_VERSION="~> 4.0.0"
     - PUPPET_GEM_VERSION="~> 4.1.0"
     - PUPPET_GEM_VERSION="~> 4.2.0"
     - PUPPET_GEM_VERSION="~> 4.3.0"
     - PUPPET_GEM_VERSION="~> 4.4.0"
     - PUPPET_GEM_VERSION="~> 4.5.0"
+    - PUPPET_GEM_VERSION="~> 4.6.0"
     - PUPPET_GEM_VERSION="~> 4"
 
 sudo: false
@@ -55,8 +57,28 @@ matrix:
       env: PUPPET_GEM_VERSION="~> 4.4.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4.5.0"
+    - rvm: 1.8.7
+      env: PUPPET_GEM_VERSION="~> 4.6.0"
     - rvm: 1.8.7
       env: PUPPET_GEM_VERSION="~> 4"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.3.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.4.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.5.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.6.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.7.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.8.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
 
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index 8978fae..8aabfdf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ else
 end
 
 gem 'metadata-json-lint'
-gem 'puppetlabs_spec_helper', '>= 1.1.1'
+gem 'puppetlabs_spec_helper', '>= 1.2.0'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet'
 gem 'puppet-lint', '>= 1.0', '< 3.0'
@@ -16,7 +16,6 @@ gem 'puppet-lint-alias-check'
 gem 'puppet-lint-empty_string-check'
 gem 'puppet-lint-file_ensure-check'
 gem 'puppet-lint-file_source_rights-check'
-gem 'puppet-lint-fileserver-check'
 gem 'puppet-lint-leading_zero-check'
 gem 'puppet-lint-spaceship_operator_without_tag-check'
 gem 'puppet-lint-trailing_comma-check'
@@ -24,13 +23,7 @@ gem 'puppet-lint-undef_in_function-check'
 gem 'puppet-lint-unquoted_string-check'
 gem 'puppet-lint-variable_contains_upcase'
 
-# rspec must be v2 for ruby 1.8.7
-if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
-  # rake >=11 does not support ruby 1.8.7
-  gem 'rspec', '~> 2.0'
-  gem 'rake', '~> 10.0'
-end
-
-if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '2.0'
-  gem 'json', '~> 1.0'
-end
+gem 'rspec',     '~> 2.0'   if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
+gem 'rake',      '~> 10.0'  if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
+gem 'json',      '<= 1.8'   if RUBY_VERSION < '2.0.0'
+gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
diff --git a/README.md b/README.md
index db2e188..40b5b9b 100644
--- a/README.md
+++ b/README.md
@@ -15,9 +15,9 @@ This module will ensure that sysklogd is absent, which is needed on EL5.
 
 # Compatibility #
 
-This module has been tested to work on the following systems with Puppet v3
-(with and without the future parser) and Puppet v4 with Ruby versions 1.8.7,
-1.9.3, 2.0.0 and 2.1.0.
+This module has been tested to work on the following systems with Puppet
+v3 (with and without the future parser) and Puppet v4 with Ruby versions
+1.8.7, 1.9.3, 2.0.0, 2.1.0 and 2.3.1.
 
  * Debian 7
  * EL 5