diff --git a/.fixtures.yml b/.fixtures.yml
new file mode 100644
index 0000000..2a7948f
--- /dev/null
+++ b/.fixtures.yml
@@ -0,0 +1,10 @@
+fixtures:
+  repositories:
+    'stdlib':
+      repo: 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '4.6.0'
+    'concat':
+      repo: 'git://github.com/puppetlabs/puppetlabs-concat.git'
+      ref: '1.2.0'
+  symlinks:
+    debnet: "#{source_dir}"
diff --git a/Gemfile b/.gemfile
similarity index 89%
rename from Gemfile
rename to .gemfile
index 84f2fc3..8705c11 100644
--- a/Gemfile
+++ b/.gemfile
@@ -1,28 +1,28 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false
   gem 'puppetlabs_spec_helper',  :require => false
   gem 'puppet-lint',             :require => false
   gem 'simplecov',               :require => false
   gem 'puppet_facts',            :require => false
   gem 'json',                    :require => false
 end
 
 group :system_tests do
   gem 'beaker-rspec',  :require => false
   gem 'serverspec',    :require => false
 end
 
-if facterversion = ENV['FACTER_GEM_VERSION']
+if facterversion = ENV['FACTER_VERSION']
   gem 'facter', facterversion, :require => false
 else
   gem 'facter', :require => false
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
+if puppetversion = ENV['PUPPET_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false
 end
diff --git a/.gitignore b/.gitignore
index 82f258e..2638dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 .project
 /.settings/
 /.DS_Store
-/README.markdown
diff --git a/.travis.yml b/.travis.yml
index ca99371..92d2350 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,36 @@
 ---
 language: ruby
 bundler_args: --without system_tests
 script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+    env: PUPPET_VERSION="~> 2.7" FACTER_VERSION="~> 1.6.0"
+    gemfile: .gemfile
+  - rvm: 1.9.3
+    env: PUPPET_VERSION="~> 2.7" FACTER_VERSION="~> 1.6.0"
+    gemfile: .gemfile
   - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0" FACTER_GEM_VERSION="~> 1.7.0"
+    env: PUPPET_VERSION="~> 3.0" FACTER_VERSION="~> 1.7.0"
+    gemfile: .gemfile
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_VERSION="~> 3.0"
+    gemfile: .gemfile
   - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 3.0"
+    gemfile: .gemfile
+  - rvm: 2.1.8
+    env: PUPPET_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    gemfile: .gemfile
+  - rvm: 2.1.8
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    gemfile: .gemfile
+  - rvm: 2.2.4
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    gemfile: .gemfile
+  - rvm: 2.3.0
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    gemfile: .gemfile
 notifications:
   email: false