12 files changed, 36 insertions, 12 deletions
diff --git a/test/server/authconfig.rb b/test/server/authconfig.rb
index 961f880e8..3944369c1 100755
--- a/test/server/authconfig.rb
+++ b/test/server/authconfig.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/authconfig'
diff --git a/test/server/authstore.rb b/test/server/authstore.rb
index 2ac56602a..f591aa0c1 100755
--- a/test/server/authstore.rb
+++ b/test/server/authstore.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/authstore'
diff --git a/test/server/bucket.rb b/test/server/bucket.rb
index 06aa763d0..c8c6411c9 100755
--- a/test/server/bucket.rb
+++ b/test/server/bucket.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 'puppettest'
diff --git a/test/server/ca.rb b/test/server/ca.rb
index fed4eebc6..81c73fe56 100755
--- a/test/server/ca.rb
+++ b/test/server/ca.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/ca'
diff --git a/test/server/fileserver.rb b/test/server/fileserver.rb
index f31cba8b4..00d235cb2 100755
--- a/test/server/fileserver.rb
+++ b/test/server/fileserver.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/fileserver'
diff --git a/test/server/logger.rb b/test/server/logger.rb
index a8cc9c8e9..6b7e6a8f4 100755
--- a/test/server/logger.rb
+++ b/test/server/logger.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 'puppettest'
diff --git a/test/server/master.rb b/test/server/master.rb
index 01681030a..16b160c74 100755
--- a/test/server/master.rb
+++ b/test/server/master.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/server/pelement.rb b/test/server/pelement.rb
index 2d2e68491..24836e66c 100755
--- a/test/server/pelement.rb
+++ b/test/server/pelement.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/pelement'
diff --git a/test/server/report.rb b/test/server/report.rb
index 7076a79c4..7e563f9e6 100755
--- a/test/server/report.rb
+++ b/test/server/report.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/report'
diff --git a/test/server/rights.rb b/test/server/rights.rb
index 45c619616..cf0a3ed94 100755
--- a/test/server/rights.rb
+++ b/test/server/rights.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/rights'
diff --git a/test/server/runner.rb b/test/server/runner.rb
index be09f8563..daec78c4d 100755
--- a/test/server/runner.rb
+++ b/test/server/runner.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/runner'
diff --git a/test/server/server.rb b/test/server/server.rb
index 09a99c18e..03fedb93f 100755
--- a/test/server/server.rb
+++ b/test/server/server.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'