diff --git a/horizon/static/horizon/js/horizon.modals.js b/horizon/static/horizon/js/horizon.modals.js
index 7646b9ca94..a56289a7be 100644
--- a/horizon/static/horizon/js/horizon.modals.js
+++ b/horizon/static/horizon/js/horizon.modals.js
@@ -113,7 +113,7 @@ horizon.modals.init_wizard = function () {
             // Add global errors.
             $.each(errors, function (index, error) {
               $fieldset.find('div.row').prepend(
-                '<div class="alert alert-message alert-danger">' +
+                '<div class="alert alert-danger">' +
                 error + '</div>');
             });
             $fieldset.find('input,  select, textarea').first().focus();
@@ -124,7 +124,7 @@ horizon.modals.init_wizard = function () {
           $field.closest('.form-group').addClass('has-error');
           $.each(errors, function (index, error) {
             $field.after(
-              '<span class="help-block alert alert-danger">' +
+              '<span class="help-block">' +
               error + '</span>');
           });
           // Focus the first invalid field.
diff --git a/horizon/static/horizon/js/horizon.users.js b/horizon/static/horizon/js/horizon.users.js
index f8effd34c7..58892aaa5b 100644
--- a/horizon/static/horizon/js/horizon.users.js
+++ b/horizon/static/horizon/js/horizon.users.js
@@ -15,7 +15,7 @@ horizon.user = {
   check_passwords_match: function() {
     var row = $("input#id_confirm_password");
     var error_id = "id_confirm_password_error";
-    var msg = "<span id='" + error_id + "' class='help-block alert alert-danger'>" + gettext("Passwords do not match.") + "</span>";
+    var msg = "<span id='" + error_id + "' class='help-block'>" + gettext("Passwords do not match.") + "</span>";
 
     var password = $("#id_password").val();
     var confirm_password = $("#id_confirm_password").val();
diff --git a/horizon/templates/horizon/common/_form_errors.html b/horizon/templates/horizon/common/_form_errors.html
index b25f5b8add..cc8147c4f4 100644
--- a/horizon/templates/horizon/common/_form_errors.html
+++ b/horizon/templates/horizon/common/_form_errors.html
@@ -2,12 +2,12 @@
   {{ hidden }}
 {% endfor %}
 {% if form.warnings %}
-  <div class="alert alert-message alert-warning">
+  <div class="alert alert-warning">
     {{ form.warnings }}
   </div>
 {% endif %}
 {% if form.non_field_errors %}
-  <div class="alert alert-message alert-danger">
+  <div class="alert alert-danger">
     {{ form.non_field_errors }}
   </div>
 {% endif %}