diff --git a/test/erb/test_erb.rb b/test/erb/test_erb.rb
index 686c404702..89fdbff6eb 100644
--- a/test/erb/test_erb.rb
+++ b/test/erb/test_erb.rb
@@ -240,7 +240,7 @@ end%>
 %%%
 EOS
     ans = <<EOS
-% 
+%\s
 % %%><%0
 % %%><%1
 %%
@@ -328,7 +328,7 @@ EOS
 
   def test_keep_lineno
     src = <<EOS
-Hello, 
+Hello,\s
 % x = "World"
 <%= x%>
 % raise("lineno")
@@ -344,21 +344,21 @@ EOS
 
     src = <<EOS
 %>
-Hello, 
+Hello,\s
 <% x = "World%%>
 "%>
 <%= x%>
 EOS
 
     ans = <<EOS
-%>Hello, 
+%>Hello,\s
 World%>
 EOS
     assert_equal(ans, ERB.new(src, nil, '>').result)
 
     ans = <<EOS
 %>
-Hello, 
+Hello,\s
 
 World%>
 EOS
@@ -366,7 +366,7 @@ EOS
 
     ans = <<EOS
 %>
-Hello, 
+Hello,\s
 
 World%>
 
@@ -374,7 +374,7 @@ EOS
     assert_equal(ans, ERB.new(src).result)
 
     src = <<EOS
-Hello, 
+Hello,\s
 <% x = "World%%>
 "%>
 <%= x%>
@@ -409,7 +409,7 @@ EOS
 % y = 'Hello'
 <%- x = "World%%>
 "-%>
-<%= x %><%- x = nil -%> 
+<%= x %><%- x = nil -%>\s
 <% raise("lineno") %>
 EOS
 
@@ -445,19 +445,19 @@ NotSkip <%- y = x -%> NotSkip
    <%- up = w.upcase -%>
    * <%= up %>
  <%- end -%>
-KeepNewLine <%- z = nil -%> 
+KeepNewLine <%- z = nil -%>\s
 EOS
 
    ans = <<EOS
 NotSkip  NotSkip
   * HELLO
   * WORLD
- NotSkip 
+ NotSkip\s
    * hello
    * HELLO
    * world
    * WORLD
-KeepNewLine  
+KeepNewLine \s
 EOS
    assert_equal(ans, ERB.new(src, nil, '-').result)
    assert_equal(ans, ERB.new(src, nil, '-%').result)
diff --git a/test/net/imap/test_imap_response_parser.rb b/test/net/imap/test_imap_response_parser.rb
index 004d93616e..2dc5f0ce4b 100644
--- a/test/net/imap/test_imap_response_parser.rb
+++ b/test/net/imap/test_imap_response_parser.rb
@@ -91,11 +91,11 @@ EOF
   def test_search_response_of_yahoo
     parser = Net::IMAP::ResponseParser.new
     response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH 1 
+* SEARCH 1\s
 EOF
     assert_equal [1], response.data
     response = parser.parse(<<EOF.gsub(/\n/, "\r\n").taint)
-* SEARCH 1 2 3 
+* SEARCH 1 2 3\s
 EOF
     assert_equal [1, 2, 3], response.data
   end
diff --git a/test/psych/test_object_references.rb b/test/psych/test_object_references.rb
index 2a659a3ae6..51d8085fa0 100644
--- a/test/psych/test_object_references.rb
+++ b/test/psych/test_object_references.rb
@@ -35,7 +35,7 @@ module Psych
 
     def test_float_references
       data = Psych.load <<-eoyml
---- 
+---\s
 - &name 1.2
 - *name
       eoyml
@@ -56,7 +56,7 @@ module Psych
 
     def test_regexp_references
       data = Psych.load <<-eoyml
---- 
+---\s
 - &name !ruby/regexp /pattern/i
 - *name
       eoyml
diff --git a/test/rdoc/test_rdoc_comment.rb b/test/rdoc/test_rdoc_comment.rb
index 1afc94c251..4d0d54edca 100644
--- a/test/rdoc/test_rdoc_comment.rb
+++ b/test/rdoc/test_rdoc_comment.rb
@@ -70,7 +70,7 @@ call-seq:
     comment = RDoc::Comment.new <<-COMMENT, @top_level
 # call-seq:
 #   bla => true or false
-# 
+#\s
 # moar comment
     COMMENT
 
diff --git a/test/rexml/test_core.rb b/test/rexml/test_core.rb
index e530cc16c6..0865aa9747 100644
--- a/test/rexml/test_core.rb
+++ b/test/rexml/test_core.rb
@@ -1176,34 +1176,34 @@ EOL
     element0
     element0
     element0
-    element0 
+    element0\s
     <element1>
       element1
       element1
       element1
       element1
-      element1 
+      element1\s
       <element2>
         element2
         element2
         element2
         element2
-        element2 
+        element2\s
         <element3>
           element3
           element3
           element3
           element3
-          element3 
+          element3\s
           <element4>
             element4
             element4
             element4
             element4
             element4
-            
+           \s
             <element5>
-              element5 element5 element5 element5 element5 
+              element5 element5 element5 element5 element5\s
             </element5>
           </element4>
         </element3>
diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
index ae007e5a6d..d06a7c80b8 100644
--- a/test/ruby/test_thread.rb
+++ b/test/ruby/test_thread.rb
@@ -567,7 +567,7 @@ class TestThread < Test::Unit::TestCase
   def for_test_async_interrupt_with_return
     Thread.async_interrupt_timing(Object => :defer){
       Thread.current.raise RuntimeError.new("have to be rescured")
-      return 
+      return
     }
   rescue
   end