diff --git a/spec/lib/diaspora_federation/entities/conversation_spec.rb b/spec/lib/diaspora_federation/entities/conversation_spec.rb
index 6cd0fcc..585971f 100644
--- a/spec/lib/diaspora_federation/entities/conversation_spec.rb
+++ b/spec/lib/diaspora_federation/entities/conversation_spec.rb
@@ -1,18 +1,12 @@
 module DiasporaFederation
   describe Entities::Conversation do
-    before do
-      @datetime = DateTime.now.utc
-    end
-
     let(:msg1) { FactoryGirl.build(:message_entity) }
     let(:msg2) { FactoryGirl.build(:message_entity) }
     let(:data) {
-      {guid:            FactoryGirl.generate(:guid),
-       subject:         "very interesting conversation subject",
-       created_at:      @datetime,
-       messages:        [msg1, msg2],
-       diaspora_id:     FactoryGirl.generate(:diaspora_id),
-       participant_ids: "#{FactoryGirl.generate(:diaspora_id)};#{FactoryGirl.generate(:diaspora_id)}"}
+      FactoryGirl.attributes_for(:conversation_entity).merge!(
+        messages:        [msg1, msg2],
+        participant_ids: "#{FactoryGirl.generate(:diaspora_id)};#{FactoryGirl.generate(:diaspora_id)}"
+      )
     }
 
     let(:xml) {
diff --git a/spec/lib/diaspora_federation/entities/status_message_spec.rb b/spec/lib/diaspora_federation/entities/status_message_spec.rb
index d0d9262..eb02727 100644
--- a/spec/lib/diaspora_federation/entities/status_message_spec.rb
+++ b/spec/lib/diaspora_federation/entities/status_message_spec.rb
@@ -4,17 +4,12 @@ module DiasporaFederation
     let(:photo2) { FactoryGirl.build(:photo_entity) }
     let(:location) { FactoryGirl.build(:location_entity) }
     let(:data) {
-      {
-        raw_message:           "this is such an interesting text",
+      FactoryGirl.attributes_for(:status_message_entity).merge!(
         photos:                [photo1, photo2],
         location:              location,
         poll:                  nil,
-        guid:                  FactoryGirl.generate(:guid),
-        diaspora_id:           FactoryGirl.generate(:diaspora_id),
-        public:                true,
-        created_at:            Time.zone.now,
         provider_display_name: "something"
-      }
+      )
     }
 
     let(:xml) {