diff --git a/spec/models/whois_record_spec.rb b/spec/models/whois_record_spec.rb
index 95c4c2082..4b5491fdb 100644
--- a/spec/models/whois_record_spec.rb
+++ b/spec/models/whois_record_spec.rb
@@ -44,7 +44,9 @@ describe WhoisRecord do
     end
 
     it 'should be valid twice' do
-      @whois_record = Fabricate(:domain).whois_record
+      domain = Fabricate(:domain)
+      domain.run_callbacks(:commit)
+      @whois_record = domain.whois_record
       @whois_record.valid?
       @whois_record.errors.full_messages.should match_array([])
     end
@@ -88,52 +90,29 @@ describe WhoisRecord do
       @domain.nameservers = [ns1, ns2]
 
       @domain.save
+      @domain.run_callbacks(:commit)
 
       # load some very dynamic attributes
       registered = @domain.whois_record.json['registered']
-      changed   = @domain.whois_record.json['updated_at']
+      changed    = @domain.whois_record.json['changed']
 
-      @domain.whois_record.body.should == <<-EOS
-Estonia .ee Top Level Domain WHOIS server
+      @domain.whois_record.body.should include "Domain:"
+      @domain.whois_record.body.should include "Registrant:"
+      @domain.whois_record.body.should include "Administrative contact:"
+      @domain.whois_record.body.should include "Technical contact:"
+      @domain.whois_record.body.should include "Registrar:"
+      @domain.whois_record.body.should include "Name servers:"
 
-Domain:
-  name:       yeah.ee
-  registrant: Jarren Jakubowski0
-  status:     ok (paid and in zone)
-  registered: #{Time.zone.parse(registered)}
-  changed:    #{Time.zone.parse(changed)}
-  expire:     2016-04-21 00:00:00 UTC
-  outzone:
-  delete:
 
-Administrative contact
-  name:       First Admin
-  email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-  registrar:  First Registrar Ltd
-  created:    2016-01-01 00:00:00 UTC
+      @domain.whois_record.body.should include "name:"
+      @domain.whois_record.body.should include "status:"
+      @domain.whois_record.body.should include "registered:"
+      @domain.whois_record.body.should include "changed:"
+      @domain.whois_record.body.should include "expire:"
+      @domain.whois_record.body.should include "expire:"
+      @domain.whois_record.body.should include "outzone:"
+      @domain.whois_record.body.should include "delete:"
 
-Technical contact:
-  name:       First Tech
-  email:      Not Disclosed - Visit www.internet.ee for webbased WHOIS
-  registrar:  First Registrar Ltd
-  created:    2016-01-01 00:00:00 UTC
-
-Registrar:
-  name:       First Registrar Ltd
-  phone:      
-  address:    Street 999, Town, County, Postal
-  changed:    1996-01-01 00:00:00 UTC
-
-Name servers:
-  nserver:   test.ee
-  changed:   1980-01-01 00:00:00 UTC
-
-  nserver:   test1.ee
-  changed:   1970-01-01 00:00:00 UTC
-
-Estonia .ee Top Level Domain WHOIS server
-More information at http://internet.ee
- EOS
     end
   end
 end