3 files changed, 5 insertions, 12 deletions
diff --git a/test/wsdl/axisArray/test_axisarray.rb b/test/wsdl/axisArray/test_axisarray.rb
index 9c7b42564c..9f220bb48a 100644
--- a/test/wsdl/axisArray/test_axisarray.rb
+++ b/test/wsdl/axisArray/test_axisarray.rb
@@ -3,6 +3,7 @@ require 'soap/processor'
 require 'soap/mapping'
 require 'soap/rpc/element'
 require 'wsdl/importer'
+require 'itemList.rb'
 
 
 module WSDL
@@ -10,10 +11,6 @@ module WSDL
 
 class TestAxisArray < Test::Unit::TestCase
   def setup
-    dir = File.dirname(File.expand_path(__FILE__))
-    $:.push(dir)
-    require 'itemList.rb'
-    $:.delete(dir)
     @xml =<<__EOX__
 <?xml version="1.0" encoding="UTF-8"?>
 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/test/wsdl/datetime/test_datetime.rb b/test/wsdl/datetime/test_datetime.rb
index 405bd1209a..0f531ff18c 100644
--- a/test/wsdl/datetime/test_datetime.rb
+++ b/test/wsdl/datetime/test_datetime.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'soap/wsdlDriver'
+require 'DatetimeService.rb'
 
 
 module WSDL
@@ -17,9 +18,6 @@ class TestDatetime < Test::Unit::TestCase
   end
 
   def setup_server
-    $:.push(DIR)
-    require File.join(DIR, 'DatetimeService.rb')
-    $:.delete(DIR)
     @server = DatetimePortTypeApp.new('Datetime server', nil, '0.0.0.0', Port)
     @server.level = Logger::Severity::ERROR
     @t = Thread.new {
diff --git a/test/wsdl/raa/test_raa.rb b/test/wsdl/raa/test_raa.rb
index 5fddb6b22d..cf171b373f 100644
--- a/test/wsdl/raa/test_raa.rb
+++ b/test/wsdl/raa/test_raa.rb
@@ -1,5 +1,8 @@
 require 'test/unit'
 require 'soap/wsdlDriver'
+require 'RAA.rb'
+require 'RAAServant.rb'
+require 'RAAService.rb'
 
 
 module WSDL
@@ -17,11 +20,6 @@ class TestRAA < Test::Unit::TestCase
   end
 
   def setup_server
-    $:.push(DIR)
-    require File.join(DIR, 'RAA.rb')
-    require File.join(DIR, 'RAAServant.rb')
-    require File.join(DIR, 'RAAService.rb')
-    $:.delete(DIR)
     @server = App.new('RAA server', nil, '0.0.0.0', Port)
     @server.level = Logger::Severity::ERROR
     @t = Thread.new {