diff --git a/spec/features/admin/cms_spec.rb b/spec/features/admin/cms_spec.rb
index 29fc2412e2..e3dfcf19b9 100644
--- a/spec/features/admin/cms_spec.rb
+++ b/spec/features/admin/cms_spec.rb
@@ -18,13 +18,13 @@ feature %q{
     current_path.should match(/^\/admin/)
   end
 
-  scenario "anonymous user can't access CMS admin" do
+  scenario "anonymous user can't access CMS admin", js: true do
     visit cms_admin_path
     page.should_not have_content "ComfortableMexicanSofa"
-    page.should have_content "Login"
+    page.should have_content "Log in"
   end
 
-  scenario "non-admin user can't access CMS admin" do
+  scenario "non-admin user can't access CMS admin", js: true do
     login_to_consumer_section
     visit cms_admin_path
     page.should_not have_content "ComfortableMexicanSofa"
diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index 0995367600..e71c0dd21a 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -68,9 +68,9 @@ module AuthenticationWorkflow
     user.spree_roles << user_role
 
     visit spree.login_path
-    fill_in 'spree_user_email', :with => 'someone@ofn.org'
-    fill_in 'spree_user_password', :with => 'passw0rd'
-    click_button 'Login'
+    fill_in 'email', :with => 'someone@ofn.org'
+    fill_in 'password', :with => 'passw0rd'
+    click_button 'Log in'
   end
 end