3 files changed, 13 insertions, 11 deletions
diff --git a/spec/rubyspec/library/socket/ipsocket/addr_spec.rb b/spec/rubyspec/library/socket/ipsocket/addr_spec.rb
index 2ac4c3d413..2184082c51 100644
--- a/spec/rubyspec/library/socket/ipsocket/addr_spec.rb
+++ b/spec/rubyspec/library/socket/ipsocket/addr_spec.rb
@@ -4,7 +4,7 @@ require File.expand_path('../../fixtures/classes', __FILE__)
 describe "Socket::IPSocket#addr" do
   before :each do
     @do_not_reverse_lookup = BasicSocket.do_not_reverse_lookup
-    @socket = TCPServer.new("127.0.0.1", SocketSpecs.port)
+    @socket = TCPServer.new("127.0.0.1", 0)
   end
 
   after :each do
@@ -17,7 +17,7 @@ describe "Socket::IPSocket#addr" do
     BasicSocket.do_not_reverse_lookup = false
     addrinfo = @socket.addr
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should == SocketSpecs.port
+    addrinfo[1].should be_kind_of(Integer)
     addrinfo[2].should == SocketSpecs.hostname
     addrinfo[3].should == "127.0.0.1"
   end
@@ -27,7 +27,7 @@ describe "Socket::IPSocket#addr" do
     BasicSocket.do_not_reverse_lookup = true
     addrinfo = @socket.addr
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should == SocketSpecs.port
+    addrinfo[1].should be_kind_of(Integer)
     addrinfo[2].should == "127.0.0.1"
     addrinfo[3].should == "127.0.0.1"
   end
@@ -35,7 +35,7 @@ describe "Socket::IPSocket#addr" do
   it "returns an address in the array if passed false" do
     addrinfo = @socket.addr(false)
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should == SocketSpecs.port
+    addrinfo[1].should be_kind_of(Integer)
     addrinfo[2].should == "127.0.0.1"
     addrinfo[3].should == "127.0.0.1"
   end
diff --git a/spec/rubyspec/library/socket/ipsocket/peeraddr_spec.rb b/spec/rubyspec/library/socket/ipsocket/peeraddr_spec.rb
index 01b697bd27..dfd4e050ce 100644
--- a/spec/rubyspec/library/socket/ipsocket/peeraddr_spec.rb
+++ b/spec/rubyspec/library/socket/ipsocket/peeraddr_spec.rb
@@ -4,8 +4,9 @@ require File.expand_path('../../fixtures/classes', __FILE__)
 describe "Socket::IPSocket#peeraddr" do
   before :each do
     @do_not_reverse_lookup = BasicSocket.do_not_reverse_lookup
-    @server = TCPServer.new("127.0.0.1", SocketSpecs.port)
-    @client = TCPSocket.new("127.0.0.1", SocketSpecs.port)
+    @server = TCPServer.new("127.0.0.1", 0)
+    @port = @server.addr[1]
+    @client = TCPSocket.new("127.0.0.1", @port)
   end
 
   after :each do
@@ -23,7 +24,7 @@ describe "Socket::IPSocket#peeraddr" do
     BasicSocket.do_not_reverse_lookup = false
     addrinfo = @client.peeraddr
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should == SocketSpecs.port
+    addrinfo[1].should == @port
     addrinfo[2].should == SocketSpecs.hostname
     addrinfo[3].should == "127.0.0.1"
   end
@@ -33,7 +34,7 @@ describe "Socket::IPSocket#peeraddr" do
     BasicSocket.do_not_reverse_lookup = true
     addrinfo = @client.peeraddr
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should == SocketSpecs.port
+    addrinfo[1].should == @port
     addrinfo[2].should == "127.0.0.1"
     addrinfo[3].should == "127.0.0.1"
   end
@@ -41,7 +42,7 @@ describe "Socket::IPSocket#peeraddr" do
   it "returns an IP instead of hostname if passed false" do
     addrinfo = @client.peeraddr(false)
     addrinfo[0].should == "AF_INET"
-    addrinfo[1].should == SocketSpecs.port
+    addrinfo[1].should == @port
     addrinfo[2].should == "127.0.0.1"
     addrinfo[3].should == "127.0.0.1"
   end
diff --git a/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb b/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb
index ccf7b1cc51..54f150decf 100644
--- a/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb
+++ b/spec/rubyspec/library/socket/ipsocket/recvfrom_spec.rb
@@ -4,8 +4,9 @@ require File.expand_path('../../fixtures/classes', __FILE__)
 describe "Socket::IPSocket#recvfrom" do
 
   before :each do
-    @server = TCPServer.new("127.0.0.1", SocketSpecs.port)
-    @client = TCPSocket.new("127.0.0.1", SocketSpecs.port)
+    @server = TCPServer.new("127.0.0.1", 0)
+    @port = @server.addr[1]
+    @client = TCPSocket.new("127.0.0.1", @port)
   end
 
   after :each do