13 files changed, 18 insertions, 17 deletions
diff --git a/test/rexml/rexml_test_utils.rb b/test/rexml/rexml_test_utils.rb
index 916e73674d..57fe65ca73 100644
--- a/test/rexml/rexml_test_utils.rb
+++ b/test/rexml/rexml_test_utils.rb
@@ -1,3 +1,4 @@
+require 'test/unit'
 module REXMLTestUtils
   def fixture_path(*components)
     File.join(File.dirname(__FILE__), "data", *components)
diff --git a/test/rexml/test_contrib.rb b/test/rexml/test_contrib.rb
index db7c18d027..356dfc1425 100644
--- a/test/rexml/test_contrib.rb
+++ b/test/rexml/test_contrib.rb
@@ -1,6 +1,6 @@
 # coding: binary
 
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 
 require "rexml/document"
 require "rexml/parseexception"
diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb
index 0865aa9747..7040ad60bf 100644
--- a/test/rexml/test_core.rb
+++ b/test/rexml/test_core.rb
@@ -1,6 +1,6 @@
 # coding: binary
 
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 
 require "rexml/document"
 require "rexml/parseexception"
@@ -9,7 +9,7 @@ require "rexml/source"
 require "rexml/formatters/pretty"
 require "rexml/undefinednamespaceexception"
 
-require "listener"
+require_relative "listener"
 
 class Tester < Test::Unit::TestCase
   include REXMLTestUtils
diff --git a/test/rexml/test_encoding.rb b/test/rexml/test_encoding.rb
index 9bcdfb3118..a3fda1e392 100644
--- a/test/rexml/test_encoding.rb
+++ b/test/rexml/test_encoding.rb
@@ -1,6 +1,6 @@
 # coding: binary
 
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 
 require 'rexml/source'
 require 'rexml/document'
diff --git a/test/rexml/test_jaxen.rb b/test/rexml/test_jaxen.rb
index 222cf79c60..05cb818a6b 100644
--- a/test/rexml/test_jaxen.rb
+++ b/test/rexml/test_jaxen.rb
@@ -1,4 +1,4 @@
-require 'rexml_test_utils'
+require_relative 'rexml_test_utils'
 
 require "rexml/document"
 require "rexml/xpath"
diff --git a/test/rexml/test_light.rb b/test/rexml/test_light.rb
index 1b56159254..9ce0fb52d8 100644
--- a/test/rexml/test_light.rb
+++ b/test/rexml/test_light.rb
@@ -1,4 +1,4 @@
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 require "rexml/light/node"
 require "rexml/parsers/lightparser"
 
diff --git a/test/rexml/test_lightparser.rb b/test/rexml/test_lightparser.rb
index 1728921434..c32c1b8ee7 100644
--- a/test/rexml/test_lightparser.rb
+++ b/test/rexml/test_lightparser.rb
@@ -1,4 +1,4 @@
-require 'rexml_test_utils'
+require_relative 'rexml_test_utils'
 require 'rexml/parsers/lightparser'
 
 class LightParserTester < Test::Unit::TestCase
diff --git a/test/rexml/test_listener.rb b/test/rexml/test_listener.rb
index 0afbdcd5ff..a3d763c5da 100644
--- a/test/rexml/test_listener.rb
+++ b/test/rexml/test_listener.rb
@@ -1,6 +1,6 @@
 # coding: binary
 
-require 'rexml_test_utils'
+require_relative 'rexml_test_utils'
 
 require 'rexml/document'
 require 'rexml/streamlistener'
@@ -82,16 +82,16 @@ class BaseTester < Test::Unit::TestCase
   end
 
   def test_accents
-    source = '<?xml version="1.0" encoding="ISO-8859-1"?>
+    source = %[<?xml version="1.0" encoding="ISO-8859-1"?>
 <g>
-<f  a="�" />
-</g>'
+<f  a="\xE9" />
+</g>]
     doc = REXML::Document.new( source )
     a = doc.elements['/g/f'].attribute('a')
                 if a.value.respond_to? :force_encoding
                   a.value.force_encoding('binary')
                 end
-    assert_equal( 'é', a.value)
+    assert_equal( "\xC3\xA9", a.value)
     doc = REXML::Document.parse_stream(
       File::new(fixture_path("stream_accents.xml")),
       AccentListener::new
diff --git a/test/rexml/test_namespace.rb b/test/rexml/test_namespace.rb
index 6ab16b6342..f855203fc8 100644
--- a/test/rexml/test_namespace.rb
+++ b/test/rexml/test_namespace.rb
@@ -1,4 +1,4 @@
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 
 require "rexml/document"
 
diff --git a/test/rexml/test_order.rb b/test/rexml/test_order.rb
index 3f874c2052..3fcbf9778b 100644
--- a/test/rexml/test_order.rb
+++ b/test/rexml/test_order.rb
@@ -1,4 +1,4 @@
-require 'rexml_test_utils'
+require_relative 'rexml_test_utils'
 require 'rexml/document'
 begin
   require 'zlib'
diff --git a/test/rexml/test_rexml_issuezilla.rb b/test/rexml/test_rexml_issuezilla.rb
index a0ebfa77dd..2a12006bac 100644
--- a/test/rexml/test_rexml_issuezilla.rb
+++ b/test/rexml/test_rexml_issuezilla.rb
@@ -1,4 +1,4 @@
-require 'rexml_test_utils'
+require_relative 'rexml_test_utils'
 require 'rexml/document'
 
 class TestIssuezillaParsing < Test::Unit::TestCase
diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb
index 8873e1703d..4a9db404d0 100644
--- a/test/rexml/test_sax.rb
+++ b/test/rexml/test_sax.rb
@@ -1,4 +1,4 @@
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 require 'rexml/sax2listener'
 require 'rexml/parsers/sax2parser'
 require 'rexml/document'
diff --git a/test/rexml/test_xpath.rb b/test/rexml/test_xpath.rb
index 4ccd4edeaf..927909a5f2 100644
--- a/test/rexml/test_xpath.rb
+++ b/test/rexml/test_xpath.rb
@@ -1,4 +1,4 @@
-require "rexml_test_utils"
+require_relative "rexml_test_utils"
 
 require "rexml/document"