diff --git a/spec/requests/admin/shipping_methods_spec.rb b/spec/requests/admin/shipping_methods_spec.rb
index b0355516c8..5897257997 100644
--- a/spec/requests/admin/shipping_methods_spec.rb
+++ b/spec/requests/admin/shipping_methods_spec.rb
@@ -4,16 +4,25 @@ feature 'shipping methods' do
   include AuthenticationWorkflow
   include WebHelper
 
-  scenario "deleting a shipping method referenced by an order" do
+  before :each do
     login_to_admin_section
+    @sm = create(:shipping_method)
+  end
 
-    sm = create(:shipping_method)
-    o = create(:order, shipping_method: sm)
+  scenario "deleting a shipping method" do
+    visit_delete spree.admin_shipping_method_path(@sm)
 
-    visit_delete spree.admin_shipping_method_path(sm)
+    page.should have_content "Shipping method \"#{@sm.name}\" has been successfully removed!"
+    Spree::ShippingMethod.where(:id => @sm.id).should be_empty
+  end
+
+  scenario "deleting a shipping method referenced by an order" do
+    o = create(:order, shipping_method: @sm)
+
+    visit_delete spree.admin_shipping_method_path(@sm)
 
     page.should have_content "That shipping method cannot be deleted as it is referenced by an order: #{o.number}."
-    Spree::ShippingMethod.find(sm.id).should_not be_nil
+    Spree::ShippingMethod.find(@sm.id).should_not be_nil
   end
 
   scenario "deleting a shipping method referenced by a product distribution"