diff --git a/app/views/admin/tags/index.html.erb b/app/views/admin/tags/index.html.erb
index c60ddaa0f..55e51a8ac 100644
--- a/app/views/admin/tags/index.html.erb
+++ b/app/views/admin/tags/index.html.erb
@@ -29,7 +29,7 @@
             <strong><%= tag.name %></strong>
         <% end %>
       </td>
-      <td>
+      <td id="tag_<%= tag.id %>">
         <%= link_to t("admin.tags.destroy"), admin_tag_path(tag), method: :delete, class: "button hollow alert" %>
       </td>
     </tr>
diff --git a/spec/features/admin/tags_spec.rb b/spec/features/admin/tags_spec.rb
index dd9c38c6b..8ff205852 100644
--- a/spec/features/admin/tags_spec.rb
+++ b/spec/features/admin/tags_spec.rb
@@ -23,7 +23,7 @@ feature 'Admin tags' do
 
     within("form.new_tag") do
       fill_in "tag_name", with: 'important issues'
-      click_button 'Create Topic'
+      click_button 'Create topic'
     end
 
     visit admin_tags_path
@@ -39,8 +39,8 @@ feature 'Admin tags' do
     expect(page).to have_content @tag1.name
     expect(page).to have_content tag2.name
 
-    within("#edit_tag_#{tag2.id}") do
-      click_link 'Destroy Topic'
+    within("#tag_#{tag2.id}") do
+      click_link 'Destroy topic'
     end
 
     visit admin_tags_path
@@ -58,8 +58,8 @@ feature 'Admin tags' do
     expect(page).to have_content @tag1.name
     expect(page).to have_content tag2.name
 
-    within("#edit_tag_#{tag2.id}") do
-      click_link 'Destroy Topic'
+    within("#tag_#{tag2.id}") do
+      click_link 'Destroy topic'
     end
 
     visit admin_tags_path
@@ -81,7 +81,7 @@ feature 'Admin tags' do
 
       within("form.new_tag") do
         fill_in "tag_name", with: "wow_category"
-        click_button 'Create Topic'
+        click_button 'Create topic'
       end
 
       expect(ActsAsTaggableOn::Tag.category.where(name: "wow_category")).to exist