diff --git a/app/views/oauth_clients/index.html.erb b/app/views/oauth_clients/index.html.erb
index 41e1e1446..f1dc4afcd 100644
--- a/app/views/oauth_clients/index.html.erb
+++ b/app/views/oauth_clients/index.html.erb
@@ -6,19 +6,22 @@
 <h3><%= t ".my_tokens" %></h3>
 <p><%= t ".list_tokens" %></p>
 <table>
-  <tr><th><%= t ".application" %></th>
-    <th><%= t ".issued_at" %></th><th>&nbsp;</th></tr>
+  <tr>
+    <th><%= t ".application" %></th>
+    <th><%= t ".issued_at" %></th>
+    <th>&nbsp;</th>
+  </tr>
   <% @tokens.each do |token| %>
-    <%= content_tag_for :tr, token do %>
+    <tr>
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>
-  <%= form_tag :controller => "oauth", :action => "revoke" do %>
-  <%= hidden_field_tag "token", token.token %>
-  <%= submit_tag t(".revoke") %>
-  <% end %>
+        <%= form_tag :controller => "oauth", :action => "revoke" do %>
+          <%= hidden_field_tag "token", token.token %>
+          <%= submit_tag t(".revoke") %>
+        <% end %>
       </td>
-    <% end %>
+    </tr>
   <% end %>
 </table>
 <% end %>
diff --git a/test/controllers/oauth_clients_controller_test.rb b/test/controllers/oauth_clients_controller_test.rb
index 81ab290b9..7a963a8e2 100644
--- a/test/controllers/oauth_clients_controller_test.rb
+++ b/test/controllers/oauth_clients_controller_test.rb
@@ -37,6 +37,7 @@ class OauthClientsControllerTest < ActionController::TestCase
   def test_index
     user = create(:user)
     create_list(:client_application, 2, :user => user)
+    create_list(:access_token, 2, :user => user)
 
     get :index,
         :params => { :display_name => user.display_name }