diff --git a/cms/djangoapps/contentstore/features/common.py b/cms/djangoapps/contentstore/features/common.py
index 69d2213eb4..8d13a39bb3 100644
--- a/cms/djangoapps/contentstore/features/common.py
+++ b/cms/djangoapps/contentstore/features/common.py
@@ -146,12 +146,13 @@ def fill_in_course_info(
 def log_into_studio(
         uname='robot',
         email='robot+studio@edx.org',
-        password='test'):
+        password='test',
+        name='Robot Studio'):
 
-    world.log_in(username=uname, password=password, email=email, name='Robot Studio')
+    world.log_in(username=uname, password=password, email=email, name=name)
     # Navigate to the studio dashboard
     world.visit('/')
-
+    world.wait_for(lambda _driver: uname in world.css_find('h2.title')[0].text)
 
 def create_a_course():
     course = world.CourseFactory.create(org='MITx', course='999', display_name='Robot Super Course')
diff --git a/cms/djangoapps/contentstore/features/course-team.feature b/cms/djangoapps/contentstore/features/course-team.feature
index 95843fc423..de5bb6556a 100644
--- a/cms/djangoapps/contentstore/features/course-team.feature
+++ b/cms/djangoapps/contentstore/features/course-team.feature
@@ -71,7 +71,7 @@ Feature: Course Team
         And she selects the new course
         And she views the course team settings
         And she deletes me from the course team
-        And I log in
+        And I am logged into studio
         Then I do not see the course on my page
 
     Scenario: Admins should be able to remove their own admin rights
diff --git a/cms/djangoapps/contentstore/features/course-team.py b/cms/djangoapps/contentstore/features/course-team.py
index 07c30e1187..a5bb24de03 100644
--- a/cms/djangoapps/contentstore/features/course-team.py
+++ b/cms/djangoapps/contentstore/features/course-team.py
@@ -66,6 +66,7 @@ def other_delete_self(_step):
         email="robot+studio@edx.org")
     world.css_click(to_delete_css)
     # confirm prompt
+    world.wait(.5)
     world.css_click(".wrapper-prompt-warning .action-primary")
 
 
@@ -89,7 +90,7 @@ def remove_course_team_admin(_step, outer_capture, name):
 
 @step(u'"([^"]*)" logs in$')
 def other_user_login(_step, name):
-    log_into_studio(uname=name, password=PASSWORD, email=name + EMAIL_EXTENSION)
+    log_into_studio(uname=name, password=PASSWORD, email=name + EMAIL_EXTENSION, name=name)
 
 
 @step(u'I( do not)? see the course on my page')