diff --git a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
index f368b6a48b5..08a596e2089 100644
--- a/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
+++ b/public/app/plugins/datasource/loki/components/LokiLabelBrowser.test.tsx
@@ -141,7 +141,7 @@ describe('LokiLabelBrowser', () => {
     render(<UnthemedLokiLabelBrowser {...props} />);
     // Selecting label2
     const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
-    expect(screen.queryByRole('list')).not.toBeInTheDocument();
+    expect(screen.queryByRole('list', { name: /Values/ })).not.toBeInTheDocument();
     userEvent.click(label2);
     expect(screen.queryByRole('option', { name: /label2/, selected: true })).toBeInTheDocument();
     // List of values for label2 appears
@@ -172,6 +172,28 @@ describe('LokiLabelBrowser', () => {
     await screen.findByRole('option', { name: 'value2-1', selected: true });
     await screen.findByRole('option', { name: 'value2-2', selected: false });
     expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-1"}');
+  });
+
+  it('allows label selection from multiple labels', async () => {
+    const props = setupProps();
+    render(<UnthemedLokiLabelBrowser {...props} />);
+
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
+    userEvent.click(label2);
+    // List of values for label2 appears
+    expect(await screen.findAllByRole('list')).toHaveLength(1);
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: /label1/, selected: false });
+    userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list')).toHaveLength(2);
+    // Selecting value2-1 of label2
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    userEvent.click(value2);
+    await screen.findByText('{label2="value2-1"}');
+
     // Selecting value from label1 for combined selector
     const value1 = await screen.findByRole('option', { name: 'value1-2', selected: false });
     userEvent.click(value1);
@@ -183,6 +205,28 @@ describe('LokiLabelBrowser', () => {
     await screen.findByRole('option', { name: /label1/, selected: false });
     expect(await screen.findAllByRole('list')).toHaveLength(1);
     expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-1"}');
+  });
+
+  it('allows clearing the label selection', async () => {
+    const props = setupProps();
+    render(<UnthemedLokiLabelBrowser {...props} />);
+
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
+    userEvent.click(label2);
+    // List of values for label2 appears
+    expect(await screen.findAllByRole('list')).toHaveLength(1);
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: /label1/, selected: false });
+    userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list')).toHaveLength(2);
+    // Selecting value2-1 of label2
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    userEvent.click(value2);
+    await screen.findByText('{label2="value2-1"}');
+
     // Clear selector
     const clearBtn = screen.getByLabelText('Selector clear button');
     userEvent.click(clearBtn);
diff --git a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx
index bb842463fa0..bf9b47de4ca 100644
--- a/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PrometheusMetricsBrowser.test.tsx
@@ -196,6 +196,28 @@ describe('PrometheusMetricsBrowser', () => {
     await screen.findByRole('option', { name: 'value2-1', selected: true });
     await screen.findByRole('option', { name: 'value2-2', selected: false });
     expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-1"}');
+  });
+
+  it('allows label selection from multiple labels', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
+    userEvent.click(label2);
+    // List of values for label2 appears
+    expect(await screen.findAllByRole('list')).toHaveLength(1);
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: /label1/, selected: false });
+    userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(2);
+    // Selecting value2-1 of label2
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    userEvent.click(value2);
+    await screen.findByText('{label2="value2-1"}');
+
     // Selecting value from label1 for combined selector
     const value1 = await screen.findByRole('option', { name: 'value1-2', selected: false });
     userEvent.click(value1);
@@ -207,6 +229,28 @@ describe('PrometheusMetricsBrowser', () => {
     await screen.findByRole('option', { name: /label1/, selected: false });
     expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(1);
     expect(screen.queryByLabelText('selector')).toHaveTextContent('{label2="value2-1"}');
+  });
+
+  it('allows clearing the label selection', async () => {
+    const props = setupProps();
+    render(<UnthemedPrometheusMetricsBrowser {...props} />);
+
+    // Selecting label2
+    const label2 = await screen.findByRole('option', { name: /label2/, selected: false });
+    userEvent.click(label2);
+    // List of values for label2 appears
+    expect(await screen.findAllByRole('list')).toHaveLength(1);
+    expect(screen.queryByLabelText('selector')).toHaveTextContent('{}');
+    // Selecting label1, list for its values appears
+    const label1 = await screen.findByRole('option', { name: /label1/, selected: false });
+    userEvent.click(label1);
+    await screen.findByLabelText('Values for label1');
+    expect(await screen.findAllByRole('list', { name: /Values/ })).toHaveLength(2);
+    // Selecting value2-1 of label2
+    const value2 = await screen.findByRole('option', { name: 'value2-1', selected: false });
+    userEvent.click(value2);
+    await screen.findByText('{label2="value2-1"}');
+
     // Clear selector
     const clearBtn = screen.getByLabelText('Selector clear button');
     userEvent.click(clearBtn);