diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 466babb38..512cc581d 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -98,9 +98,8 @@ class RepositoryTest < ActiveSupport::TestCase
   end
 
   def test_destroy
-    changesets = Changeset.count(:all, :conditions => "repository_id = 10")
-    changes = Change.count(:all, :conditions => "repository_id = 10",
-                           :joins => :changeset)
+    changesets = Changeset.where("repository_id = 10").all.count
+    changes = Changeset.joins([:changes]).where("repository_id = 10").all.count
     assert_difference 'Changeset.count', -changesets do
       assert_difference 'Change.count', -changes do
         Repository.find(10).destroy