diff --git a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
index 1aeb343e469..bed9772068c 100644
--- a/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
+++ b/public/app/features/dashboard/components/AddPanelWidget/AddPanelWidget.tsx
@@ -215,7 +215,7 @@ const AddPanelWidgetHandle: React.FC<AddPanelWidgetHandleProps> = ({ children, o
     <div className={cx(styles.headerRow, 'grid-drag-handle')}>
       {onBack && (
         <div className={styles.backButton}>
-          <IconButton name="arrow-left" onClick={onBack} surface="header" size="xl" />
+          <IconButton aria-label="Go back" name="arrow-left" onClick={onBack} surface="header" size="xl" />
         </div>
       )}
       {!onBack && (
diff --git a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
index d97b21835d8..47e0fbb0f73 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareExport.tsx
@@ -136,11 +136,11 @@ export class ShareExport extends PureComponent<Props, State> {
       <>
         <p className="share-modal-info-text">Export this dashboard.</p>
         <Field label="Export for sharing externally">
-          <Switch value={shareExternally} onChange={this.onShareExternallyChange} />
+          <Switch id="share-externally-toggle" value={shareExternally} onChange={this.onShareExternallyChange} />
         </Field>
         {config.featureToggles.trimDefaults && (
           <Field label="Export with default values removed">
-            <Switch value={trimDefaults} onChange={this.onTrimDefaultsChange} />
+            <Switch id="trim-defaults-toggle" value={trimDefaults} onChange={this.onTrimDefaultsChange} />
           </Field>
         )}
         <Modal.ButtonRow>
diff --git a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
index cc3cf9abb18..617c15dec03 100644
--- a/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
+++ b/public/app/features/dashboard/components/ShareModal/ShareSnapshot.tsx
@@ -223,10 +223,11 @@ export class ShareSnapshot extends PureComponent<Props, State> {
           </p>
         </div>
         <Field label="Snapshot name">
-          <Input width={30} value={snapshotName} onChange={this.onSnapshotNameChange} />
+          <Input id="snapshot-name-input" width={30} value={snapshotName} onChange={this.onSnapshotNameChange} />
         </Field>
         <Field label="Expire">
           <Select
+            inputId="expire-select-input"
             menuShouldPortal
             width={30}
             options={expireOptions}
@@ -239,7 +240,7 @@ export class ShareSnapshot extends PureComponent<Props, State> {
           description="You might need to configure the timeout value if it takes a long time to collect your dashboard
             metrics."
         >
-          <Input type="number" width={21} value={timeoutSeconds} onChange={this.onTimeoutChange} />
+          <Input id="timeout-input" type="number" width={21} value={timeoutSeconds} onChange={this.onTimeoutChange} />
         </Field>
 
         <Modal.ButtonRow>