3 files changed, 27 insertions, 9 deletions
diff --git a/test/soap/marshal/test_digraph.rb b/test/soap/marshal/test_digraph.rb
index 93f555ffc1..2e79589dc4 100644
--- a/test/soap/marshal/test_digraph.rb
+++ b/test/soap/marshal/test_digraph.rb
@@ -1,6 +1,11 @@
 require 'test/unit'
 require 'soap/marshal'
 
+
+module SOAP
+module Marshal
+
+
 class Node; include SOAP::Marshallable
   attr_reader :first, :second, :str
 
@@ -43,3 +48,7 @@ class TestDigraph < Test::Unit::TestCase
     end
   end
 end
+
+
+end
+end
diff --git a/test/soap/marshal/test_marshal.rb b/test/soap/marshal/test_marshal.rb
index 8a1b82946f..87e364e2aa 100644
--- a/test/soap/marshal/test_marshal.rb
+++ b/test/soap/marshal/test_marshal.rb
@@ -1,22 +1,18 @@
 require 'test/unit'
+require 'soap/marshal'
 
-dir = File.dirname(__FILE__)
-$:.push(dir)
-require 'cmarshal'
-$:.delete(dir)
 
-CMarshal.soap4r
+module SOAP
+module Marshal
 
 
 module MarshalTestLib
   def encode(o)
-    #self.class::MarshalClass.dump(o)
-    CMarshal.dump(o)
+    SOAPMarshal.dump(o)
   end
 
   def decode(s)
-    #self.class::MarshalClass.load(s)
-    CMarshal.load(s)
+    SOAPMarshal.load(s)
   end
 
   def marshaltest(o1)
@@ -299,3 +295,7 @@ end
 class TestMarshal < Test::Unit::TestCase
   include MarshalTestLib
 end
+
+
+end
+end
diff --git a/test/soap/marshal/test_struct.rb b/test/soap/marshal/test_struct.rb
index 6596fb7a33..d3c0a4e5e8 100644
--- a/test/soap/marshal/test_struct.rb
+++ b/test/soap/marshal/test_struct.rb
@@ -1,6 +1,11 @@
 require 'test/unit'
 require 'soap/marshal'
 
+
+module SOAP
+module Marshal
+
+
 Foo1 = Struct.new("Foo1", :m)
 Foo2 = Struct.new(:m)
 class Foo3
@@ -36,3 +41,7 @@ class TestStruct < Test::Unit::TestCase
     SOAP::Marshal.unmarshal(SOAP::Marshal.marshal(obj))
   end
 end
+
+
+end
+end