diff --git a/lib/puma.rb b/lib/puma.rb
index a49e7f49..49792e14 100644
--- a/lib/puma.rb
+++ b/lib/puma.rb
@@ -1,4 +1,3 @@
-
 # Standard libraries
 require 'socket'
 require 'tempfile'
diff --git a/test/testhelp.rb b/test/testhelp.rb
index 94a5a8cd..8d7dc200 100644
--- a/test/testhelp.rb
+++ b/test/testhelp.rb
@@ -2,8 +2,9 @@
 # Copyright (c) 2005 Zed A. Shaw 
 
 
-%w(lib ext bin test).each do |dir| 
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+%w(lib test).each do |d|
+  dir = File.expand_path("../../#{d}", __FILE__)
+  $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 end
 
 require 'rubygems'
@@ -18,7 +19,7 @@ require 'puma'
 def redirect_test_io
   yield
 end
-    
+
 # Either takes a string to do a get request against, or a tuple of [URI, HTTP] where
 # HTTP is some kind of Net::HTTP request object (POST, HEAD, etc.)
 def hit(uris)