1 files changed, 14 insertions, 12 deletions
diff --git a/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb b/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
index cdb6c798c0..c25322869c 100644
--- a/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
+++ b/spec/ruby/library/socket/addrinfo/ipv6_multicast_spec.rb
@@ -1,5 +1,4 @@
-require_relative '../../../spec_helper'
-require 'socket'
+require_relative '../spec_helper'
 
 describe "Addrinfo#ipv6_multicast?" do
   describe "for an ipv4 socket" do
@@ -8,7 +7,7 @@ describe "Addrinfo#ipv6_multicast?" do
       @other     = Addrinfo.tcp("0.0.0.0", 80)
     end
 
-    it "returns true for the loopback address" do
+    it "returns true for a multicast address" do
       @multicast.ipv6_multicast?.should be_false
     end
 
@@ -18,21 +17,24 @@ describe "Addrinfo#ipv6_multicast?" do
   end
 
   describe "for an ipv6 socket" do
-    before :each do
-      @multicast = Addrinfo.tcp("ff02::1", 80)
-      @other     = Addrinfo.tcp("::", 80)
-    end
-
-    it "returns false for the loopback address" do
-      @multicast.ipv6_multicast?.should be_true
+    it "returns true for a multicast address" do
+      Addrinfo.ip('ff00::').ipv6_multicast?.should == true
+      Addrinfo.ip('ff00::1').ipv6_multicast?.should == true
+      Addrinfo.ip('ff08::1').ipv6_multicast?.should == true
+      Addrinfo.ip('fff8::1').ipv6_multicast?.should == true
+
+      Addrinfo.ip('ff02::').ipv6_multicast?.should == true
+      Addrinfo.ip('ff02::1').ipv6_multicast?.should == true
+      Addrinfo.ip('ff0f::').ipv6_multicast?.should == true
     end
 
     it "returns false for another address" do
-      @other.ipv6_multicast?.should be_false
+      Addrinfo.ip('::1').ipv6_multicast?.should == false
+      Addrinfo.ip('fe80::').ipv6_multicast?.should == false
     end
   end
 
-  platform_is_not :windows do
+  with_feature :unix_socket do
     describe "for a unix socket" do
       before :each do
         @addrinfo = Addrinfo.unix("/tmp/sock")