diff --git a/spec/support/time_matcher.rb b/spec/support/time_matcher.rb
index b3e59efde26..762b6d74a05 100644
--- a/spec/support/time_matcher.rb
+++ b/spec/support/time_matcher.rb
@@ -11,7 +11,11 @@ RSpec::Matchers.define :be_within_one_minute_of do |expected_time|
 end
 
 RSpec::Matchers.define :eq_time do |expected_time|
-  match { |actual_time| (actual_time - expected_time).abs < 0.001 }
+  match do |actual_time|
+    return true if expected_time.nil? && actual_time.nil?
+    return false if expected_time.nil? || actual_time.nil?
+    (actual_time - expected_time).abs < 0.001
+  end
   failure_message { |actual_time| "#{actual_time} is not within 1 millisecond of #{expected_time}" }
   failure_message_when_negated do |actual_time|
     "#{actual_time} is within 1 millisecond of #{expected_time}"