diff --git a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
index 37822b3e0a0..11d7dcf5b14 100644
--- a/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
+++ b/public/app/core/components/QueryOperationRow/QueryOperationAction.tsx
@@ -26,7 +26,7 @@ export const QueryOperationAction: React.FC<QueryOperationActionProps> = ({
     <div className={cx(styles.icon, active && styles.active)}>
       <IconButton
         name={icon}
-        title={title}
+        tooltip={title}
         className={styles.icon}
         disabled={!!disabled}
         onClick={onClick}
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 34ded3050a7..be9eea29b9d 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -155,11 +155,11 @@ class UnConnectedExploreToolbar extends PureComponent<Props> {
         >
           <ToolbarButtonRow>
             {!splitted ? (
-              <ToolbarButton title="Split" onClick={() => split()} icon="columns" disabled={isLive}>
+              <ToolbarButton tooltip="Split the pane" onClick={() => split()} icon="columns" disabled={isLive}>
                 Split
               </ToolbarButton>
             ) : (
-              <ToolbarButton title="Close split pane" onClick={() => closeSplit(exploreId)} icon="times">
+              <ToolbarButton tooltip="Close split pane" onClick={() => closeSplit(exploreId)} icon="times">
                 Close
               </ToolbarButton>
             )}
diff --git a/public/app/features/explore/QueryRows.test.tsx b/public/app/features/explore/QueryRows.test.tsx
index e4a6f95bd04..d4ddb45221f 100644
--- a/public/app/features/explore/QueryRows.test.tsx
+++ b/public/app/features/explore/QueryRows.test.tsx
@@ -78,7 +78,7 @@ describe('Explore QueryRows', () => {
     // waiting for the d&d component to fully render.
     await screen.findAllByText('someDs query editor');
 
-    let duplicateButton = screen.getByTitle('Duplicate query');
+    let duplicateButton = screen.getByLabelText(/Duplicate query/i);
 
     fireEvent.click(duplicateButton);
 
diff --git a/public/app/features/explore/Wrapper.test.tsx b/public/app/features/explore/Wrapper.test.tsx
index ad0a1c665e6..7d1c33ff49d 100644
--- a/public/app/features/explore/Wrapper.test.tsx
+++ b/public/app/features/explore/Wrapper.test.tsx
@@ -211,17 +211,17 @@ describe('Wrapper', () => {
     });
   });
 
-  it('can close a pane from a split', async () => {
+  it('can close a panel from a split', async () => {
     const urlParams = {
       left: JSON.stringify(['now-1h', 'now', 'loki', { refId: 'A' }]),
       right: JSON.stringify(['now-1h', 'now', 'elastic', { refId: 'A' }]),
     };
     setupExplore({ urlParams });
-    const closeButtons = await screen.findAllByTitle(/Close split pane/i);
+    const closeButtons = await screen.findAllByLabelText(/Close split pane/i);
     await userEvent.click(closeButtons[1]);
 
     await waitFor(() => {
-      const logsPanels = screen.queryAllByTitle(/Close split pane/i);
+      const logsPanels = screen.queryAllByLabelText(/Close split pane/i);
       expect(logsPanels.length).toBe(0);
     });
   });