diff --git a/test/base/twilltestcase.py b/test/base/twilltestcase.py
index 2575b03e515..84ce588c2b6 100644
--- a/test/base/twilltestcase.py
+++ b/test/base/twilltestcase.py
@@ -1513,7 +1513,7 @@ class TwillTestCase( unittest.TestCase ):
             # HACK: don't use panels because late_javascripts() messes up the twill browser and it
             # can't find form fields (and hence user can't be logged in).
             self.visit_url( "/user/login?use_panels=False" )
-            self.submit_form( 'login', 'login_button', email=email, redirect=redirect, password=password )
+            self.submit_form( 'login', 'login_button', login=email, redirect=redirect, password=password )
 
     def logout( self ):
         self.visit_url( "%s/user/logout" % self.url )
diff --git a/test/tool_shed/base/twilltestcase.py b/test/tool_shed/base/twilltestcase.py
index 9138212692d..68ba9df7744 100644
--- a/test/tool_shed/base/twilltestcase.py
+++ b/test/tool_shed/base/twilltestcase.py
@@ -573,7 +573,7 @@ class ShedTwillTestCase( TwillTestCase ):
             self.create_user_in_galaxy( email=email, password=password, username=username, redirect=redirect )
         if previously_created:
             self.visit_galaxy_url( "/user/login?use_panels=False" )
-            self.submit_form( '1', 'login_button', email=email, redirect=redirect, password=password )
+            self.submit_form( '1', 'login_button', login=email, redirect=redirect, password=password )
         
     def galaxy_logout( self ):
         self.visit_galaxy_url( "/user/logout" )