diff --git a/spec/factories.rb b/spec/factories.rb
index f714c54..d20ada5 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -54,8 +54,7 @@ FactoryGirl.define do
     url "http://localhost:3000/"
     exported_key { generate(:public_key) }
     profile {
-      DiasporaFederation::Entities::Profile.new(
-        FactoryGirl.attributes_for(:profile_entity, diaspora_id: diaspora_id))
+      FactoryGirl.build(:profile_entity, diaspora_id: diaspora_id)
     }
   end
 
diff --git a/spec/lib/diaspora_federation/entities/conversation_spec.rb b/spec/lib/diaspora_federation/entities/conversation_spec.rb
index efcfc45..6cd0fcc 100644
--- a/spec/lib/diaspora_federation/entities/conversation_spec.rb
+++ b/spec/lib/diaspora_federation/entities/conversation_spec.rb
@@ -4,8 +4,8 @@ module DiasporaFederation
       @datetime = DateTime.now.utc
     end
 
-    let(:msg1) { Entities::Message.new(FactoryGirl.attributes_for(:message_entity)) }
-    let(:msg2) { Entities::Message.new(FactoryGirl.attributes_for(:message_entity)) }
+    let(:msg1) { FactoryGirl.build(:message_entity) }
+    let(:msg2) { FactoryGirl.build(:message_entity) }
     let(:data) {
       {guid:            FactoryGirl.generate(:guid),
        subject:         "very interesting conversation subject",
diff --git a/spec/lib/diaspora_federation/entities/status_message_spec.rb b/spec/lib/diaspora_federation/entities/status_message_spec.rb
index 06328ce..d0d9262 100644
--- a/spec/lib/diaspora_federation/entities/status_message_spec.rb
+++ b/spec/lib/diaspora_federation/entities/status_message_spec.rb
@@ -1,8 +1,8 @@
 module DiasporaFederation
   describe Entities::StatusMessage do
-    let(:photo1) { Entities::Photo.new(FactoryGirl.attributes_for(:photo_entity)) }
-    let(:photo2) { Entities::Photo.new(FactoryGirl.attributes_for(:photo_entity)) }
-    let(:location) { Entities::Location.new(FactoryGirl.attributes_for(:location_entity)) }
+    let(:photo1) { FactoryGirl.build(:photo_entity) }
+    let(:photo2) { FactoryGirl.build(:photo_entity) }
+    let(:location) { FactoryGirl.build(:location_entity) }
     let(:data) {
       {
         raw_message:           "this is such an interesting text",