5 files changed, 12 insertions, 9 deletions
diff --git a/test/soap/ssl/test_ssl.rb b/test/soap/ssl/test_ssl.rb
index d6df970160..38f859acdc 100644
--- a/test/soap/ssl/test_ssl.rb
+++ b/test/soap/ssl/test_ssl.rb
@@ -179,14 +179,14 @@ __EOP__
     cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
     cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
     #cfg.timeout = 123
-    assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
-    #
     cfg["protocol.http.ssl_config.ciphers"] = "!ALL"
+    #
     begin
       @client.hello_world("ssl client")
       assert(false)
     rescue OpenSSL::SSL::SSLError => ssle
-      assert_equal("no ciphers available", ssle.message)
+      # depends on OpenSSL version. (?:0.9.8|0.9.7)
+      assert_match(/\A(?:SSL_CTX_set_cipher_list:: no cipher match|no ciphers available)\z/, ssle.message)
     end
     #
     cfg["protocol.http.ssl_config.ciphers"] = "ALL"
@@ -201,7 +201,7 @@ private
 
   def setup_server
     svrcmd = "#{q(RUBY)} "
-    svrcmd << "-d " if $DEBUG
+    #svrcmd << "-d " if $DEBUG
     svrcmd << File.join(DIR, "sslsvr.rb")
     svrout = IO.popen(svrcmd)
     @serverpid = Integer(svrout.gets.chomp)
diff --git a/test/soap/swa/test_file.rb b/test/soap/swa/test_file.rb
index 8389d8826c..1ec7aa92a7 100644
--- a/test/soap/swa/test_file.rb
+++ b/test/soap/swa/test_file.rb
@@ -47,11 +47,14 @@ class TestFile < Test::Unit::TestCase
     @client.reset_stream
   end
 
-  def test_file
+  def test_get_file
     assert_equal(
       File.open(THIS_FILE) { |f| f.read },
       @client.get_file['file'].content
     )
+  end
+
+  def test_put_file
     assert_equal(
       "File 'foo' was received ok.",
       @client.put_file('foo',
diff --git a/test/soap/test_soapelement.rb b/test/soap/test_soapelement.rb
index 6cf91f93d6..66e2a836a4 100644
--- a/test/soap/test_soapelement.rb
+++ b/test/soap/test_soapelement.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'soap/baseData'
+require 'soap/mapping'
 
 
 module SOAP
@@ -36,7 +37,7 @@ class TestSOAPElement < Test::Unit::TestCase
     assert_equal(LiteralNamespace, obj.encodingstyle)
     assert_equal({}, obj.extraattr)
     assert_equal([], obj.precedents)
-    assert_equal(false, obj.qualified)
+    assert_equal(nil, obj.qualified)
     assert_equal(nil, obj.text)
     assert(obj.members.empty?)
 
diff --git a/test/soap/test_streamhandler.rb b/test/soap/test_streamhandler.rb
index a8d06d5f2a..c31254513f 100644
--- a/test/soap/test_streamhandler.rb
+++ b/test/soap/test_streamhandler.rb
@@ -98,7 +98,7 @@ __EOX__
   end
 
   def parse_req_header(str)
-    if ::SOAP::StreamHandler::Client.to_s == 'SOAP::NetHttpClient'
+    if ::SOAP::HTTPStreamHandler::Client.to_s == 'SOAP::NetHttpClient'
       str = eval(str.split(/\r?\n/)[4][3..-1])
     end
     parse_req_header_http_access2(str)
diff --git a/test/soap/wsdlDriver/test_calc.rb b/test/soap/wsdlDriver/test_calc.rb
index 629c5cdbfb..f1cc116a59 100644
--- a/test/soap/wsdlDriver/test_calc.rb
+++ b/test/soap/wsdlDriver/test_calc.rb
@@ -73,8 +73,7 @@ class TestCalc < Test::Unit::TestCase
     assert_equal(0.3, @client.add(0.1, 0.2))
   end
 
-  # test for backward compatibility
-  def __NOTEST__test_old_driver
+  def test_old_driver
     @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_driver
     @client.wiredump_dev = STDOUT if $DEBUG
     @client.endpoint_url = "http://localhost:#{Port}/"