diff --git a/test/net/smtp/test_smtp.rb b/test/net/smtp/test_smtp.rb
index 320e75d..09fe5bf 100644
--- a/test/net/smtp/test_smtp.rb
+++ b/test/net/smtp/test_smtp.rb
@@ -467,6 +467,8 @@ def test_start_with_starttls_false
     end
 
     def test_start_auth_plain
+      omit "This test is not supported on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
+
       port = fake_server_start(auth: 'plain')
       Net::SMTP.start('localhost', port, user: 'account', password: 'password', authtype: :plain){}
 
@@ -482,6 +484,8 @@ def test_start_auth_plain
     end
 
     def test_start_auth_login
+      omit "This test is not supported on Windows" if /mswin|mingw/ =~ RUBY_PLATFORM
+
       port = fake_server_start(auth: 'LOGIN')
       Net::SMTP.start('localhost', port, user: 'account', password: 'password', authtype: :login){}
 
@@ -789,7 +793,7 @@ def loop
           @sock.puts "502 5.5.2 Error: command not recognized\r\n"
         end
       end
-    rescue Errno::ECONNRESET
+    rescue Errno::ECONNRESET, Errno::ECONNABORTED
       nil
     end
   end