diff --git a/.gitignore b/.gitignore
index 38f7e291..2c7a54c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ coverage/
 .*.sw[op]
 .DS_Store
 .rspec
+tmp/
 
diff --git a/.sync.yml b/.sync.yml
index 0bc5c2b6..656c6b27 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -10,25 +10,9 @@ CONTRIBUTING.md:
   unmanaged: true
 Gemfile:
   supports_windows: true
-  required:
+  optional:
     ':development':
-      - gem: rake
-        version: '~>10.1'
-      - gem: rspec
-        version: '~>3.0'
-      - gem: puppet-lint
-      - gem: puppetlabs_spec_helper
-        version: '~>0.10.3'
-      - gem: puppet_facts
-      - gem: mocha
-        version: '~>0.10.5'
-      - gem: pry
-      - gem: simplecov
       - gem: yard
-    ':system_tests':
-      - gem: beaker-rspec
-      - gem: beaker
-      - gem: beaker-puppet_install_helper
 Rakefile:
   unmanaged: true
 spec/spec_helper.rb:
diff --git a/Gemfile b/Gemfile
index 15017571..9a7aeedc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -36,14 +36,13 @@ end
 #end
 
 group :development do
-  gem 'rake', '~>10.1',                      :require => false
+  gem 'rake',                                :require => false
   gem 'rspec', '~>3.0',                      :require => false
   gem 'puppet-lint',                         :require => false
   gem 'puppetlabs_spec_helper', '~>0.10.3',  :require => false
   gem 'puppet_facts',                        :require => false
   gem 'mocha', '~>0.10.5',                   :require => false
   gem 'pry',                                 :require => false
-  gem 'simplecov',                           :require => false
   gem 'yard',                                :require => false
 end
 
diff --git a/Rakefile b/Rakefile
index 79121771..96304f9f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,7 +1,10 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 
+# Line length test is 80 chars in puppet-lint 1.1.0
 PuppetLint.configuration.send('disable_80chars')
+# Line length test is 140 chars in puppet-lint 2.x
+PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Validate manifests, templates, and ruby files"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7cb87359..9491df9e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,3 @@
-require 'simplecov'
 require 'rspec-puppet'
 require 'puppetlabs_spec_helper/module_spec_helper'
 
@@ -12,12 +11,3 @@
   end
 end
 
-SimpleCov.start do
-  add_group "Functions", "lib/puppet/parser/functions"
-  add_group "Types", "lib/puppet/type/"
-  add_group "Provider", "lib/puppet/provider"
-  add_group "Manifests", "manifests"
-  add_group "PuppetX", "lib/puppet_x/"
-  add_filter "/spec/"
-end
-