rackup should expect $LOAD_PATH to already be set up

2 files changed, 2 insertions, 4 deletions

diff --git a/bin/rackup b/bin/rackup
index 874fe192..91abe17b 100755
--- a/bin/rackup
+++ b/bin/rackup
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
 
-$LOAD_PATH.unshift File.expand_path("#{__FILE__}/../../lib")
-autoload :Rack, 'rack'
+require 'rack'
 
 require 'optparse'
 
diff --git a/test/cgi/test.ru b/test/cgi/test.ru
index 4054b886..fc9b6ffc 100755
--- a/test/cgi/test.ru
+++ b/test/cgi/test.ru
@@ -1,5 +1,4 @@
-#!/usr/bin/env ../../bin/rackup
-#\ -E deployment -I ../../lib
+#!/usr/bin/env ruby -I ../../lib ../../bin/rackup -E deployment -I ../../lib
 # -*- ruby -*-
 
 require '../testrequest'