12 files changed, 20 insertions, 22 deletions
diff --git a/test/csv/test_csv_parsing.rb b/test/csv/test_csv_parsing.rb
index 3da9df755d..55d1bee80b 100755
--- a/test/csv/test_csv_parsing.rb
+++ b/test/csv/test_csv_parsing.rb
@@ -18,7 +18,7 @@ require_relative "base"
 # separator <tt>$/</tt>.
 #
 class TestCSV::Parsing < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   BIG_DATA = "123456789\n" * 1024
 
diff --git a/test/csv/test_csv_writing.rb b/test/csv/test_csv_writing.rb
index 2c98abb137..704c1d7ddc 100755
--- a/test/csv/test_csv_writing.rb
+++ b/test/csv/test_csv_writing.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Writing < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def test_writing
     [ ["\t",                      ["\t"]],
diff --git a/test/csv/test_data_converters.rb b/test/csv/test_data_converters.rb
index e878c28380..3351620e10 100755
--- a/test/csv/test_data_converters.rb
+++ b/test/csv/test_data_converters.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::DataConverters < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index e125f3baad..0067d6f53f 100755
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Encodings < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
diff --git a/test/csv/test_features.rb b/test/csv/test_features.rb
index 70ba39d0fe..0da557e6e1 100755
--- a/test/csv/test_features.rb
+++ b/test/csv/test_features.rb
@@ -12,7 +12,7 @@ require "zlib"
 require_relative "base"
 
 class TestCSV::Features < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   TEST_CASES = [ [%Q{a,b},               ["a", "b"]],
                  [%Q{a,"""b"""},         ["a", "\"b\""]],
diff --git a/test/csv/test_headers.rb b/test/csv/test_headers.rb
index 96ff485cad..00ae82af06 100755
--- a/test/csv/test_headers.rb
+++ b/test/csv/test_headers.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Headers < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb
index f939d9e1ad..8343146754 100755
--- a/test/csv/test_interface.rb
+++ b/test/csv/test_interface.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Interface < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
diff --git a/test/csv/test_row.rb b/test/csv/test_row.rb
index 38383d5a00..345b7a2342 100755
--- a/test/csv/test_row.rb
+++ b/test/csv/test_row.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Row < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
diff --git a/test/csv/test_serialization.rb b/test/csv/test_serialization.rb
index 9fafe02c59..0adb972c2f 100755
--- a/test/csv/test_serialization.rb
+++ b/test/csv/test_serialization.rb
@@ -25,7 +25,7 @@ class Hash
 end
 
 class TestCSV::Serialization < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   ### Classes Used to Test Serialization ###
 
diff --git a/test/csv/test_table.rb b/test/csv/test_table.rb
index 731d526190..d045b9afe4 100755
--- a/test/csv/test_table.rb
+++ b/test/csv/test_table.rb
@@ -10,7 +10,7 @@
 require_relative "base"
 
 class TestCSV::Table < TestCSV
-  include DifferentOFS
+  extend DifferentOFS
 
   def setup
     super
diff --git a/test/digest/test_digest_extend.rb b/test/digest/test_digest_extend.rb
index 0821720210..577fd7a455 100644
--- a/test/digest/test_digest_extend.rb
+++ b/test/digest/test_digest_extend.rb
@@ -3,7 +3,7 @@ require 'digest'
 require_relative '../with_different_ofs.rb'
 
 class TestDigestExtend < Test::Unit::TestCase
-  include DifferentOFS
+  extend DifferentOFS
 
   class MyDigest < Digest::Class
     def initialize(*arg)
diff --git a/test/with_different_ofs.rb b/test/with_different_ofs.rb
index 3192da9d1f..76dfa6896c 100644
--- a/test/with_different_ofs.rb
+++ b/test/with_different_ofs.rb
@@ -1,18 +1,16 @@
 module DifferentOFS
-  def setup
-    super
-    @ofs, $, = $,, "-"
-  end
-  def teardown
-    $, = @ofs
-    super
-  end
-
   module WithDifferentOFS
-    def with_diffrent_ofs
+    def setup
+      super
+      @ofs, $, = $,, "-"
+    end
+    def teardown
+      $, = @ofs
+      super
     end
   end
-  def self.included(klass)
+
+  def self.extended(klass)
     super(klass)
     klass.const_set(:DifferentOFS, Class.new(klass).class_eval {include WithDifferentOFS}).name
   end