diff --git a/Gemfile b/Gemfile
index e55eacfff..c9423e923 100644
--- a/Gemfile
+++ b/Gemfile
@@ -95,6 +95,5 @@ group :test do
   gem 'rr',                 '~> 1.0.4'
   gem 'shoulda'
   gem 'mock_redis',         '0.6.2'
-  gem 'test_after_commit',  '0.2.0'
   gem 'rake'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index b5c710783..dfe789d3c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -363,7 +363,6 @@ GEM
     state_machine (1.1.2)
     stringex (1.4.0)
     systemu (2.5.2)
-    test_after_commit (0.2.0)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
     thin (1.5.1)
@@ -467,7 +466,6 @@ DEPENDENCIES
   shotgun
   shoulda
   state_machine
-  test_after_commit (= 0.2.0)
   therubyracer (~> 0.10.2)
   therubyrhino (~> 1.73.1)
   trinidad (~> 1.0.2)
diff --git a/spec/lib/observers/activity_feed/comment_spec.rb b/spec/lib/observers/activity_feed/comment_spec.rb
index 139e9e114..1c027a3e3 100644
--- a/spec/lib/observers/activity_feed/comment_spec.rb
+++ b/spec/lib/observers/activity_feed/comment_spec.rb
@@ -2,6 +2,7 @@
 require 'spec_helper'
 
 describe Modules::Observers::ActivityFeed::Comment do
+  self.use_transactional_fixtures = false
   before { stub_symlink_methods }
   
   it 'sends a notification email after create a issue comment' do
@@ -11,4 +12,5 @@ describe Modules::Observers::ActivityFeed::Comment do
     comment.save
   end
 
+  before(:all) { User.destroy_all }
 end
diff --git a/spec/lib/observers/activity_feed/issue_spec.rb b/spec/lib/observers/activity_feed/issue_spec.rb
index 37e9d2730..f67179655 100644
--- a/spec/lib/observers/activity_feed/issue_spec.rb
+++ b/spec/lib/observers/activity_feed/issue_spec.rb
@@ -2,6 +2,7 @@
 require 'spec_helper'
 
 describe Modules::Observers::ActivityFeed::Issue do
+  self.use_transactional_fixtures = false
   before { stub_symlink_methods }
 
   it 'sends a notification email after create' do
@@ -27,4 +28,5 @@ describe Modules::Observers::ActivityFeed::Issue do
     issue.save
   end
 
+  before(:all) { User.destroy_all }
 end