1 files changed, 12 insertions, 5 deletions
diff --git a/spec/ruby/core/time/shared/gmtime.rb b/spec/ruby/core/time/shared/gmtime.rb
index e684a1fd95..aa76b436cc 100644
--- a/spec/ruby/core/time/shared/gmtime.rb
+++ b/spec/ruby/core/time/shared/gmtime.rb
@@ -4,14 +4,21 @@ describe :time_gmtime, shared: true do
     with_timezone("CST", -6) do
       t = Time.local(2007, 1, 9, 6, 0, 0)
       t.send(@method)
-      t.should == Time.gm(2007, 1, 9, 12, 0, 0)
+      # Time#== compensates for time zones, so check all parts separately
+      t.year.should == 2007
+      t.month.should == 1
+      t.mday.should == 9
+      t.hour.should == 12
+      t.min.should == 0
+      t.sec.should == 0
+      t.zone.should == "UTC"
     end
   end
 
   it "returns self" do
     with_timezone("CST", -6) do
       t = Time.local(2007, 1, 9, 12, 0, 0)
-      t.send(@method).should equal(t)
+      t.send(@method).should.equal?(t)
     end
   end
 
@@ -19,14 +26,14 @@ describe :time_gmtime, shared: true do
     it "does not raise an error if already in UTC" do
       time = Time.gm(2007, 1, 9, 12, 0, 0)
       time.freeze
-      time.send(@method).should equal(time)
+      time.send(@method).should.equal?(time)
     end
 
-    it "raises a RuntimeError if the time is not UTC" do
+    it "raises a FrozenError if the time is not UTC" do
       with_timezone("CST", -6) do
         time = Time.now
         time.freeze
-        lambda { time.send(@method) }.should raise_error(RuntimeError)
+        -> { time.send(@method) }.should.raise(FrozenError)
       end
     end
   end