diff --git a/spec/controllers/deploys_controller_spec.rb b/spec/controllers/deploys_controller_spec.rb
index f267366..ba2619f 100644
--- a/spec/controllers/deploys_controller_spec.rb
+++ b/spec/controllers/deploys_controller_spec.rb
@@ -12,7 +12,7 @@ describe DeploysController do
         'scm_revision'   => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
         'message'        => 'johns first deploy'
       }
-      @app = Factory(:app_with_watcher, :notify_on_deploys => true, :api_key => 'APIKEY')
+      @app = Fabricate(:app_with_watcher, :notify_on_deploys => true, :api_key => 'APIKEY')
     end
 
     it 'finds the app via the api key' do
@@ -30,7 +30,7 @@ describe DeploysController do
           :revision     => '19d77837eef37902cf5df7e4445c85f392a8d0d5',
           :message      => 'johns first deploy'
 
-        }).and_return(Factory(:deploy))
+        }).and_return(Fabricate(:deploy))
       post :create, :deploy => @params, :api_key => 'APIKEY'
     end
 
@@ -45,8 +45,8 @@ describe DeploysController do
 
   context "GET #index" do
     before(:each) do
-      @deploy = Factory :deploy
-      sign_in Factory(:admin)
+      @deploy = Fabricate :deploy
+      sign_in Fabricate(:admin)
       get :index, :app_id => @deploy.app.id
     end
 
diff --git a/spec/fabricators/app_fabricator.rb b/spec/fabricators/app_fabricator.rb
index 8ead91a..f560375 100644
--- a/spec/fabricators/app_fabricator.rb
+++ b/spec/fabricators/app_fabricator.rb
@@ -9,7 +9,7 @@ end
 Fabricator(:watcher) do
   app!
   watcher_type 'email'
-  email   { sequence(:email) }
+  email   { sequence(:email){|n| "email#{n}@example.com"} }
 end
 
 Fabricator(:user_watcher, :from => :watcher) do
diff --git a/spec/fabricators/sequences_fabricator.rb b/spec/fabricators/sequences_fabricator.rb
index e058be8..561be74 100644
--- a/spec/fabricators/sequences_fabricator.rb
+++ b/spec/fabricators/sequences_fabricator.rb
@@ -1,5 +1,3 @@
 Fabricate.sequence(:name) {|n| "John #{n} Doe"}
 Fabricate.sequence(:word) {|n| "word#{n}"}
-Fabricate.sequence(:email) {|n| "email#{n}@example.com"}
-Fabricate.sequence(:user_email) {|n| "user.#{n}@example.com"}
 
--
libgit2 0.21.2