diff --git a/templates/SilverStripe/Security/CMSSecurity_login.ss b/templates/SilverStripe/Security/CMSSecurity_login.ss
index a4834f0b6..cd02e2032 100644
--- a/templates/SilverStripe/Security/CMSSecurity_login.ss
+++ b/templates/SilverStripe/Security/CMSSecurity_login.ss
@@ -7,7 +7,7 @@
 	<body class="cms cms-security fill-height">
         <% with $Form %>
             <% if $Message %>
-                <div class="cms-security__container__error message $MessageType">
+                <div class="cms-security__container__error alert $AlertType">
                     <p id="{$FormName}_error">$Message</p>
                 </div>
             <% end_if %>
diff --git a/tests/behat/src/CmsUiContext.php b/tests/behat/src/CmsUiContext.php
index 209835615..aea6f2ea1 100644
--- a/tests/behat/src/CmsUiContext.php
+++ b/tests/behat/src/CmsUiContext.php
@@ -85,7 +85,13 @@ class CmsUiContext implements Context
      */
     public function iShouldSeeAMessage($message)
     {
-        $this->getMainContext()->assertElementContains('.message', $message);
+        $page = $this->getMainContext()->getSession()->getPage();
+        if ($page->find('css', '.message')) {
+            $this->getMainContext()->assertElementContains('.message', $message);
+        } else {
+            // Support for new Bootstrap alerts
+            $this->getMainContext()->assertElementContains('.alert', $message);
+        }
     }
 
     protected function getCmsTabsElement()
