2 files changed, 7 insertions, 5 deletions
diff --git a/spec/ruby/library/socket/udpsocket/initialize_spec.rb b/spec/ruby/library/socket/udpsocket/initialize_spec.rb
index 9497d0dcbc..1d635149f7 100644
--- a/spec/ruby/library/socket/udpsocket/initialize_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/initialize_spec.rb
@@ -31,12 +31,10 @@ describe 'UDPSocket#initialize' do
   end
 
   it 'raises Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT when given an invalid address family' do
-    begin
+    -> {
       UDPSocket.new(666)
-    rescue Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT => e
+    }.should raise_error(SystemCallError) { |e|
       [Errno::EAFNOSUPPORT, Errno::EPROTONOSUPPORT].should include(e.class)
-    else
-      raise "expected Errno::EAFNOSUPPORT or Errno::EPROTONOSUPPORT exception raised"
-    end
+    }
   end
 end
diff --git a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
index 62bbaf0dc9..fb88a2dc13 100644
--- a/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
+++ b/spec/ruby/library/socket/udpsocket/recvfrom_nonblock_spec.rb
@@ -34,6 +34,10 @@ describe 'UDPSocket#recvfrom_nonblock' do
         it 'raises IO::WaitReadable' do
           lambda { @server.recvfrom_nonblock(1) }.should raise_error(IO::WaitReadable)
         end
+
+        it 'returns :wait_readable with exception: false' do
+          @server.recvfrom_nonblock(1, exception: false).should == :wait_readable
+        end
       end
 
       platform_is_not :windows do