diff --git a/app/views/tag_wranglers/show.html.erb b/app/views/tag_wranglers/show.html.erb
index 33a7eb28157..0c39cf9ba34 100644
--- a/app/views/tag_wranglers/show.html.erb
+++ b/app/views/tag_wranglers/show.html.erb
@@ -5,7 +5,7 @@
     <p class="icon"><%= icon_display(@wrangler) %></p>
     <!--/descriptions-->
     <!--subnav-->
-    <% if policy(:tag_wrangler).report_csv? %>
+    <% if policy(:wrangling).report_csv? %>
       <ul class="navigation actions" role="navigation">
         <li><%= link_to t(".tags_wrangled_csv"), report_csv_tag_wrangler_path %></li>
       </ul>
diff --git a/features/tags_and_wrangling/tag_wrangling_admin.feature b/features/tags_and_wrangling/tag_wrangling_admin.feature
index d412cbff6f0..5d70da67b07 100644
--- a/features/tags_and_wrangling/tag_wrangling_admin.feature
+++ b/features/tags_and_wrangling/tag_wrangling_admin.feature
@@ -54,7 +54,7 @@ Feature: Tag wrangling
   Scenario: Admin can remove a user's wrangling assignments
 
     Given the tag wrangler "tangler" with password "wr@ngl3r" is wrangler of "Testing"
-    When I am logged in as an admin
+    When I am logged in as a "tag_wrangling" admin
       And I am on the wranglers page
       And I follow "x"
     Then I should see "Wranglers were successfully unassigned!"
diff --git a/spec/controllers/tag_wranglers_controller_spec.rb b/spec/controllers/tag_wranglers_controller_spec.rb
index 9b03c293b11..c89e6727d59 100644
--- a/spec/controllers/tag_wranglers_controller_spec.rb
+++ b/spec/controllers/tag_wranglers_controller_spec.rb
@@ -39,7 +39,12 @@
   end
 
   before(:all) do
-    Role.find_or_create_by(name: "tag_wrangler")
+    Role.create!(name: "tag_wrangler")
+  end
+
+  after(:all) do
+    # Clean up when we're done, a few other specs become unhappy otherwise
+    Role.find_by(name: "tag_wrangler").destroy!
   end
 
   describe "#index" do