diff --git a/Gemfile b/Gemfile
index abce1dd..af9c613 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,11 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kafo_parsers.gemspec
 gemspec
+
+puppet_version = ENV['PUPPET_VERSION']
+puppet_spec = puppet_version ? "~> #{puppet_version}" : '< 5.0.0'
+gem 'puppet', puppet_spec
+
+if puppet_version.nil? || (puppet_version >= '3.7' && RUBY_VERSION >= '1.9')
+  gem 'puppet-strings'
+end
diff --git a/kafo_parsers.gemspec b/kafo_parsers.gemspec
index a9d92bd..c4fce42 100644
--- a/kafo_parsers.gemspec
+++ b/kafo_parsers.gemspec
@@ -23,7 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "ci_reporter", "~> 1.9.0"
 
   # puppet manifests parsing
-  spec.add_development_dependency 'puppet', '< 5.0.0'
   spec.add_dependency 'rdoc', '>= 3.9.0'
   spec.add_dependency 'json'
 end