diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index c51a2954e5..a83f455163 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -2033,7 +2033,7 @@ module Net
       end
     end
 
-    class BodyTypeExtension < Struct.new(:media_type, :subtype, 
+    class BodyTypeExtension < Struct.new(:media_type, :subtype,
                                          :params, :content_id,
                                          :description, :encoding, :size)
       def multipart?
@@ -2414,11 +2414,11 @@ module Net
         # If this is not message/rfc822, we shouldn't apply the RFC822 spec
         # to it.
         # We should handle anything other than message/rfc822 using
-        # multipart extension data [rfc3501] (i.e. the data itself won't be 
+        # multipart extension data [rfc3501] (i.e. the data itself won't be
         # returned, we would have to retrieve it with BODYSTRUCTURE instead
         # of with BODY
         if "#{mtype}/#{msubtype}" != 'MESSAGE/RFC822' then
-          return BodyTypeExtension.new(mtype, msubtype, 
+          return BodyTypeExtension.new(mtype, msubtype,
                                        param, content_id,
                                        desc, enc, size)
         end
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb
index a39e2c7723..18b0d6f725 100644
--- a/test/ruby/test_exception.rb
+++ b/test/ruby/test_exception.rb
@@ -472,7 +472,7 @@ end.join
       assert_equal(false, s.tainted?,
                    "#{exc}#to_s should not propagate taintness")
     end
-    
+
     o = Object.new
     def o.to_str
       "foo"
diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb
index b5ee0eb93c..8ddd4b79a0 100644
--- a/test/ruby/test_settracefunc.rb
+++ b/test/ruby/test_settracefunc.rb
@@ -533,7 +533,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
 
   def test_tracepoint
     events1, answer_events = *trace_by_tracepoint()
-    
+
     mesg = events1.map{|e|
       "#{e[0]} - #{e[2]}:#{e[1]} id: #{e[4]}"
     }.join("\n")
@@ -627,7 +627,7 @@ class TestSetTraceFunc < Test::Unit::TestCase
 
   def test_tracepoint_enabled
     trace = TracePoint.trace(:call){|tp|
-      # 
+      #
     }
     assert_equal(true, trace.enabled?)
     trace.disable{