diff --git a/app/views/comment/_comment_actions.rhtml b/app/views/comment/_comment_actions.rhtml
index ae04c88..6c9c47e 100644
--- a/app/views/comment/_comment_actions.rhtml
+++ b/app/views/comment/_comment_actions.rhtml
@@ -12,7 +12,8 @@
     <%= link_to_function '',
       "var f = add_comment_reply_form(this, %s); f.find('comment_title, textarea').val(''); return false" % comment.id,
       :class => 'comment-footer comment-footer-link comment-footer-hide comment-actions-reply button',
-      :id => 'comment-reply-to-' + comment.id.to_s
+      :id => 'comment-reply-to-' + comment.id.to_s,
+      :title => _('Reply')
     %>
   <% end %>
   <% links_action_bar.collect do |link| %>
diff --git a/features/comment_reply.feature b/features/comment_reply.feature
index 5d7093c..3d0b1f8 100644
--- a/features/comment_reply.feature
+++ b/features/comment_reply.feature
@@ -23,7 +23,7 @@ Feature: comment
   Scenario: show error messages when make a blank comment reply
     Given I am logged in as "booking"
     And I go to /booking/article-to-comment
-    And I follow "Reply" within ".comment-balloon"
+    And I follow "Reply" within ".comments-action-bar"
     When I press "Post comment" within ".comment-balloon"
     Then I should see "Title can't be blank" within "div.comment_reply"
     And I should see "Body can't be blank" within "div.comment_reply"
@@ -31,30 +31,30 @@ Feature: comment
   @selenium
   Scenario: render reply form
     Given I am on /booking/article-to-comment
-    When I follow "Reply" within ".comment-balloon"
+    When I follow "Reply" within ".comments-action-bar"
     Then I should see "Enter your comment" within "div.comment_reply.opened"
 
   # The text is hidden but the detector gets it anyway
   @selenium-fixme
   Scenario: cancel comment reply
     Given I am on /booking/article-to-comment
-    When I follow "Reply" within ".comment-balloon"
-    And I follow "Cancel" within ".comment-balloon"
+    And I follow "Reply" within ".comments-action-bar"
+    When I follow "Cancel" within ".comment-balloon"
     Then I should not see "Enter your comment" within "div.comment_reply.closed"
 
   @selenium-fixme
   Scenario: not render same reply form twice
     Given I am on /booking/article-to-comment
-    When I follow "Reply" within ".comment-balloon"
+    And I follow "Reply" within ".comments-action-bar"
     And I follow "Cancel" within ".comment-balloon"
-    And I follow "Reply" within ".comment-balloon"
+    When I follow "Reply" within ".comments-action-bar"
     Then there should be 1 "comment_form" within "comment_reply"
     And I should see "Enter your comment" within "div.comment_reply.opened"
 
   @selenium-fixme
   Scenario: reply a comment
     Given I go to /booking/another-article
-    And I follow "Reply" within ".comment-balloon"
+    And I follow "Reply" within ".comments-action-bar"
     And I fill in "Name" within "comment-balloon" with "Joey"
     And I fill in "e-mail" within "comment-balloon" with "joey@ramones.com"
     And I fill in "Title" within "comment-balloon" with "Hey ho, let's go!"
@@ -73,7 +73,7 @@ Feature: comment
       | rails.png | booking | root comment | this comment is not a reply |
     Given I am logged in as "booking"
     And I go to /booking/rails.png?view=true
-    And I follow "Reply" within ".comment-balloon"
+    And I follow "Reply" within ".comments-action-bar"
     And I fill in "Title" within "comment-balloon" with "Hey ho, let's go!"
     And I fill in "Enter your comment" within "comment-balloon" with "Hey ho, let's go!"
     When I press "Post comment" within ".comment-balloon"
--
libgit2 0.21.2