5 files changed, 15 insertions, 5 deletions
diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index c3d357398..4fde6ba59 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/server'
diff --git a/test/executables/puppetca.rb b/test/executables/puppetca.rb
index 137bdf922..f96e7a5f5 100755
--- a/test/executables/puppetca.rb
+++ b/test/executables/puppetca.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/server'
diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb
index 9098d76c2..ffe0b001e 100755
--- a/test/executables/puppetd.rb
+++ b/test/executables/puppetd.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/server'
diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb
index 0b8c549ec..6fc98137b 100755
--- a/test/executables/puppetmasterd.rb
+++ b/test/executables/puppetmasterd.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/server'
diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb
index b809f218a..c70f92fe9 100755
--- a/test/executables/puppetmodule.rb
+++ b/test/executables/puppetmodule.rb
@@ -1,4 +1,6 @@
-#!/usr/bin/env ruby -I../lib -I../../lib
+#!/usr/bin/env ruby
+
+$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppet'
 require 'puppet/server'