diff --git a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
index 6b6dc427979..b0855b48040 100644
--- a/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
+++ b/packages/grafana-ui/src/components/Forms/FieldValidationMessage.tsx
@@ -45,7 +45,7 @@ export const FieldValidationMessage: React.FC<FieldValidationMessageProps> = ({
   const styles = getFieldValidationMessageStyles(theme);
 
   return (
-    <div className={cx(styles.fieldValidationMessage, className)}>
+    <div role="alert" className={cx(styles.fieldValidationMessage, className)}>
       <Icon className={styles.fieldValidationMessageIcon} name="exclamation-triangle" />
       {children}
     </div>
diff --git a/packages/grafana-ui/src/components/index.ts b/packages/grafana-ui/src/components/index.ts
index 93eebc97817..39553882e46 100644
--- a/packages/grafana-ui/src/components/index.ts
+++ b/packages/grafana-ui/src/components/index.ts
@@ -143,6 +143,7 @@ export { Label } from './Forms/Label';
 export { Field } from './Forms/Field';
 export { Legend } from './Forms/Legend';
 export { FieldSet } from './Forms/FieldSet';
+export { FieldValidationMessage } from './Forms/FieldValidationMessage';
 
 export { default as resetSelectStyles } from './Select/resetSelectStyles';
 export * from './Select/Select';