diff --git a/spec/integration/message_and_receipt_spec.rb b/spec/integration/message_and_receipt_spec.rb
index f6787b31..1fa159e6 100644
--- a/spec/integration/message_and_receipt_spec.rb
+++ b/spec/integration/message_and_receipt_spec.rb
@@ -4,8 +4,8 @@
   
   describe "two equal entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:user)
     end
     
     describe "message sending" do    
@@ -190,8 +190,8 @@
   
   describe "two different entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
     end
     
     describe "message sending" do    
@@ -352,9 +352,9 @@
   
   describe "three equal entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:user)
-      @entity3 = Factory(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:user)
+      @entity3 = FactoryGirl.create(:user)
       @recipients = Array.new
       @recipients << @entity2
       @recipients << @entity3
@@ -534,9 +534,9 @@
   
   describe "three different entities" do
     before do
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
-      @entity3 = Factory(:cylon)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
+      @entity3 = FactoryGirl.create(:cylon)
       @recipients = Array.new
       @recipients << @entity2
       @recipients << @entity3
diff --git a/spec/mailers/message_mailer_spec.rb b/spec/mailers/message_mailer_spec.rb
index e4a93858..98d7d7e7 100644
--- a/spec/mailers/message_mailer_spec.rb
+++ b/spec/mailers/message_mailer_spec.rb
@@ -3,10 +3,10 @@
 describe MessageMailer do
   describe "when sending new message" do
     before do
-      @sender = Factory(:user)
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
-      @entity3 = Factory(:cylon)
+      @sender = FactoryGirl.create(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
+      @entity3 = FactoryGirl.create(:cylon)
       @receipt1 = @sender.send_message([@entity1,@entity2,@entity3], "Body Body Body Body Body Body Body Body Body Body Body Body","Subject")
     end
 
@@ -48,10 +48,10 @@
 
   describe "when replying" do
     before do
-      @sender = Factory(:user)
-      @entity1 = Factory(:user)
-      @entity2 = Factory(:duck)
-      @entity3 = Factory(:cylon)
+      @sender = FactoryGirl.create(:user)
+      @entity1 = FactoryGirl.create(:user)
+      @entity2 = FactoryGirl.create(:duck)
+      @entity3 = FactoryGirl.create(:cylon)
       @receipt1 = @sender.send_message([@entity1,@entity2,@entity3], "Body","Subject")
       @receipt2 = @sender.reply_to_all(@receipt1, "Body")
     end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index b34693aa..7993803e 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -2,9 +2,9 @@
 
 describe NotificationMailer do
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:duck)
-    @entity3 = Factory(:cylon)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:duck)
+    @entity3 = FactoryGirl.create(:cylon)
     @receipt1 = Notification.notify_all([@entity1,@entity2,@entity3],"Subject", "Body Body Body Body Body Body Body Body Body Body Body Body")
   end
 
diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb
index 93826441..4a4e5f80 100644
--- a/spec/models/conversation_spec.rb
+++ b/spec/models/conversation_spec.rb
@@ -3,8 +3,8 @@
 describe Conversation do
 
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
     @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
     @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
     @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
@@ -47,7 +47,7 @@
   end
 
   describe "scopes" do
-    let(:participant) { Factory(:user) }
+    let(:participant) { FactoryGirl.create(:user) }
     let!(:inbox_conversation) { @entity1.send_message(participant, "Body", "Subject").notification.conversation }
     let!(:sentbox_conversation) { participant.send_message(@entity1, "Body", "Subject").notification.conversation }
 
diff --git a/spec/models/mailbox_spec.rb b/spec/models/mailbox_spec.rb
index 00bf6814..03e6c836 100644
--- a/spec/models/mailbox_spec.rb
+++ b/spec/models/mailbox_spec.rb
@@ -3,8 +3,8 @@
 describe Mailbox do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
     @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
     @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
     @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
diff --git a/spec/models/mailboxer_models_messageable_spec.rb b/spec/models/mailboxer_models_messageable_spec.rb
index 85c80aed..9089a67a 100644
--- a/spec/models/mailboxer_models_messageable_spec.rb
+++ b/spec/models/mailboxer_models_messageable_spec.rb
@@ -3,8 +3,8 @@
 describe "Mailboxer::Models::Messageable through User" do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
   end
   
   it "should have a mailbox" do
diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb
index e15eb6ed..e522b569 100644
--- a/spec/models/message_spec.rb
+++ b/spec/models/message_spec.rb
@@ -3,8 +3,8 @@
 describe Message do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
     @receipt1 = @entity1.send_message(@entity2,"Body","Subject")
     @receipt2 = @entity2.reply_to_all(@receipt1,"Reply body 1")
     @receipt3 = @entity1.reply_to_all(@receipt2,"Reply body 2")
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index a96e8622..86f64761 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -3,9 +3,9 @@
 describe Message do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
-    @entity3 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
+    @entity3 = FactoryGirl.create(:user)
   end  
   
   it "should notify one user" do
diff --git a/spec/models/receipt_spec.rb b/spec/models/receipt_spec.rb
index dd6865bf..310f753d 100644
--- a/spec/models/receipt_spec.rb
+++ b/spec/models/receipt_spec.rb
@@ -3,8 +3,8 @@
 describe Receipt do
   
   before do
-    @entity1 = Factory(:user)
-    @entity2 = Factory(:user)
+    @entity1 = FactoryGirl.create(:user)
+    @entity2 = FactoryGirl.create(:user)
     @mail1 = @entity1.send_message(@entity2,"Body","Subject")   
   end