diff --git a/spec/controllers/user_tokens_controller_spec.rb b/spec/controllers/user_tokens_controller_spec.rb
index 1c50591..500331c 100644
--- a/spec/controllers/user_tokens_controller_spec.rb
+++ b/spec/controllers/user_tokens_controller_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe UserTokensController do
   describe '#create' do
     let(:user) { Factory(:user) }
-    let(:user_token) { Factory.build(:user_token, :user => nil) }
+    let(:user_token) { FactoryGirl.build(:user_token, :user => nil) }
 
     before do
       @controller.stub!(:current_user => user)
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index 120c014..6eed361 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -1,10 +1,11 @@
 # Read about factories at http://github.com/thoughtbot/factory_girl
-Factory.sequence(:uid) { |n| n }
 
 FactoryGirl.define do
+  sequence(:uid) { |n| n }
+
   factory :user do
     provider "twitter"
-    uid { Factory.next(:uid) }
+    uid
     nickname "mrFoo"
     email nil
     name nil
diff --git a/spec/models/asciicast_spec.rb b/spec/models/asciicast_spec.rb
index 708c899..ca1961e 100644
--- a/spec/models/asciicast_spec.rb
+++ b/spec/models/asciicast_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Asciicast do
   it "has valid factory" do
-    Factory.build(:asciicast).should be_valid
+    FactoryGirl.build(:asciicast).should be_valid
   end
 
   describe '.assign_user' do
@@ -23,7 +23,7 @@ describe Asciicast do
   end
 
   describe '#save' do
-    let(:asciicast) { Factory.build(:asciicast, :user => user) }
+    let(:asciicast) { FactoryGirl.build(:asciicast, :user => user) }
 
     context 'when no user given' do
       let(:user) { nil }
@@ -35,7 +35,7 @@ describe Asciicast do
     end
 
     context 'when user given' do
-      let(:user) { Factory.build(:user) }
+      let(:user) { FactoryGirl.build(:user) }
 
       it "doesn't call #assign_user" do
         asciicast.should_not_receive(:assign_user)
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index cd5a872..d3f252d 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -3,12 +3,12 @@ require 'spec_helper'
 describe Comment do
 
   it "factory should be valid" do
-    Factory.build(:comment).should be_valid
+    FactoryGirl.build(:comment).should be_valid
   end
 
   describe "#as_json" do
     let(:user) { Factory(:user) }
-    let(:comment) { Factory.build(:comment) }
+    let(:comment) { FactoryGirl.build(:comment) }
 
     before do
       comment.user = user
@@ -30,7 +30,7 @@ describe Comment do
   describe "#created" do
     let(:time) { Time.new(2012, 01, 03) }
     let(:expected) { time.strftime("%Y-%m-%dT%H:%M:%S") }
-    let(:comment) { Factory.build(:comment) }
+    let(:comment) { FactoryGirl.build(:comment) }
 
     context "when created_at present" do
       before { comment.stub(:created_at).and_return(time) }
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index e3243e1..87677c9 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe User do
 
-  let(:user) { Factory.build(:user) }
+  let(:user) { FactoryGirl.build(:user) }
 
   it "has valid factory" do
-    Factory.build(:user).should be_valid
+    FactoryGirl.build(:user).should be_valid
   end
 
   describe ".create_with_omniauth" do
@@ -52,7 +52,7 @@ describe User do
     before { user.save }
 
     context "when user doesn't have given token" do
-      let(:token) { Factory.attributes_for(:user_token)[:token] }
+      let(:token) { FactoryGirl.attributes_for(:user_token)[:token] }
 
       it 'returns created UserToken' do
         ut = user.add_user_token(token)
diff --git a/spec/models/user_token_spec.rb b/spec/models/user_token_spec.rb
index 8835028..f1e76e6 100644
--- a/spec/models/user_token_spec.rb
+++ b/spec/models/user_token_spec.rb
@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe UserToken do
   it "has valid factory" do
-    Factory.build(:user_token).should be_valid
+    FactoryGirl.build(:user_token).should be_valid
   end
 end