diff --git a/app/views/admin/enterprise_roles/index.html.haml b/app/views/admin/enterprise_roles/index.html.haml
index 0881a8a50e..a6e0985a99 100644
--- a/app/views/admin/enterprise_roles/index.html.haml
+++ b/app/views/admin/enterprise_roles/index.html.haml
@@ -11,5 +11,5 @@
   %table#enterprise-roles
     %tbody
       = render 'form'
-      %tr{"ng-repeat" => "enterprise_role in EnterpriseRoles.enterprise_roles | filter:query"}
+      %tr{"ng-repeat" => "enterprise_role in EnterpriseRoles.enterprise_roles | filter:query", id: "enterprise_role_{{enterprise_role.id}}"}
         = render 'enterprise_role'
diff --git a/spec/features/admin/enterprise_roles_spec.rb b/spec/features/admin/enterprise_roles_spec.rb
index 0e44c9cfe3..7256b4e03c 100644
--- a/spec/features/admin/enterprise_roles_spec.rb
+++ b/spec/features/admin/enterprise_roles_spec.rb
@@ -71,7 +71,9 @@ feature %q{
       visit admin_enterprise_roles_path
       page.should have_relationship u, e
 
-      first("a.delete-enterprise-role").click
+      within("#enterprise_role_#{er.id}") do
+        find("a.delete-enterprise-role").click
+      end
 
       page.should_not have_relationship u, e
       EnterpriseRole.where(id: er.id).should be_empty