diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index ce2bd305d..67b7d9a78 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -9,14 +9,14 @@ describe AlbumsController do
  render_views
   before do
     @user = Factory.create(:user)
-    @user.aspect(:name => "lame-os")
-    @album = Factory.create(:album)
+    @aspect = @user.aspect(:name => "lame-os")
+    @album = @user.post :album, :to => @aspect.id, :name => 'things on fire'
     sign_in :user, @user
   end
 
   it "should update the name of an album" do
     sign_in :user, @user
-    put :update, :id => @album._id, :album => { :name => "new_name"}
+    put :update, :id => @album.id, :album => { :name => "new_name"}
     @album.reload.name.should eql("new_name")
   end