diff --git a/features/step_definitions/playlists_step.rb b/features/step_definitions/playlists_step.rb
index 2adcffd..a7ff567 100644
--- a/features/step_definitions/playlists_step.rb
+++ b/features/step_definitions/playlists_step.rb
@@ -3,10 +3,10 @@ Given /^a playlist named "([^"]*)"$/ do |name|
 end
 
 Then /^I should see "([^"]*)" and "([^"]*)" in a list$/ do |pl1, pl2|
-  page.should have_selector('ul>li:first-child', :text => pl1)
-  page.should have_selector('ul>li:first-child+li', :text => pl2)
+  Then "I should see \"#{pl1}\" within \"ul>li:first-child\""
+  Then "I should see \"#{pl2}\" within \"ul>li:first-child+li\""
 end
 
 Then /^I should see "([^"]*)" in the list$/ do |playlist_name|
-  page.should have_selector('ul>li', :text => playlist_name)
+  Then "I should see \"#{playlist_name}\" within \"ul>li\""
 end
diff --git a/features/step_definitions/sessions_step.rb b/features/step_definitions/sessions_step.rb
index 6f0ff50..aa3535f 100644
--- a/features/step_definitions/sessions_step.rb
+++ b/features/step_definitions/sessions_step.rb
@@ -3,11 +3,8 @@ Given /^I am not signed in$/ do
 end
 
 Given /^I am signed in$/ do
-  user = Factory.create(:user)
   visit new_session_path
-  fill_in('Email', :with => user.email)
-  fill_in('Password', :with => user.password)
-  click_button('Sign in')
+  When "I submit valid credentials"
 end
 
 Then /^I should be redirected to the sign in page$/ do