diff --git a/features/step_definitions/dependencies_steps.rb b/features/step_definitions/dependencies_steps.rb
index 7c49b159..88e782ab 100644
--- a/features/step_definitions/dependencies_steps.rb
+++ b/features/step_definitions/dependencies_steps.rb
@@ -10,8 +10,8 @@ end
 When /^I drag "(.*)" to "(.*)"$/ do |dragged, target|
   drag_id = Todo.where(:description => dragged).first.id
   drop_id = Todo.where(:description => target).first.id
-  drag_elem = page.find(:xpath, "//div[@id='line_todo_#{drag_id}']//img[@class='grip']")
-  drop_elem = page.find(:xpath, "//div[@id='line_todo_#{drop_id}']")
+  drag_elem = page.find("div#line_todo_#{drag_id} img.grip")
+  drop_elem = page.find("div#line_todo_#{drop_id}")
 
   drag_elem.drag_to(drop_elem)
 end
diff --git a/features/step_definitions/todo_steps.rb b/features/step_definitions/todo_steps.rb
index a0100249..f9dd2c4d 100644
--- a/features/step_definitions/todo_steps.rb
+++ b/features/step_definitions/todo_steps.rb
@@ -75,9 +75,7 @@ end
 Then /^I should see an active todo "([^"]*)"$/ do |todo_description|
   todo = @current_user.todos.where(:description => todo_description).first
   expect(todo).to_not be_nil
-
-  xpath = "//div[@id='line_todo_#{todo.id}']/img[@class='grip']"
-  expect(page).to have_xpath(xpath, :visible=>true)
+  expect(page).to have_css("div#line_todo_#{todo.id} img.grip", :visible=>true)
 end
 
 Then /^the number of actions should be (\d+)$/ do |count|