diff --git a/modules/user/user.test b/modules/user/user.test
index 634fbf74f5..dbd34f14fd 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -441,7 +441,7 @@ class UserLoginTestCase extends DrupalWebTestCase {
       $this->assertResponse(403);
       $last_log = db_query_range('SELECT message FROM {watchdog} WHERE type = :type ORDER BY wid DESC', 0, 1, array(':type' => 'user'))->fetchField();
       if ($flood_trigger == 'user') {
-        $this->assertRaw(t('Too many failed login attempts for this account. It is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
+        $this->assertRaw(t('Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
         $this->assertEqual('Flood control blocked login attempt for %user from %ip.', $last_log, 'A watchdog message was logged for the login attempt blocked by flood control per user');
       }
       else {
@@ -451,7 +451,7 @@ class UserLoginTestCase extends DrupalWebTestCase {
       }
     }
     else {
-      $this->assertResponse(200);
+      $this->assertResponse(403);
       $this->assertText(t('Sorry, unrecognized username or password. Have you forgotten your password?'));
     }
   }