diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index 5989a8f23f..c861120912 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -88,9 +88,9 @@ class TestNonblockSocket < Test::Unit::TestCase
     IO.select [c]
     mesg, unix_addr = c.recvfrom_nonblock(100)
     assert_equal("aaa", mesg)
-    if unix_addr != nil # connection-oriented socket may not return the peer address.
-      assert_equal(2, unix_addr.length)
-      af, path = unix_addr
+    assert_equal(2, unix_addr.length)
+    af, path = unix_addr
+    if path != "" # connection-oriented socket may not return the peer address.
       assert_equal(serv_path, path)
     end
     s.close
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index 081100073a..a918fff966 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -148,9 +148,10 @@ class TestUNIXSocket < Test::Unit::TestCase
     assert_equal("", s1.recv(10))
     assert_equal("", s1.recv(10))
     assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) }
+  rescue Errno::EPROTONOSUPPORT
   ensure
-    s1.close
-    s2.close
+    s1.close if s1
+    s2.close if s2
   end
 
 end if defined?(UNIXSocket)