diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.test.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.test.tsx
index 71849b4bd78..88c8a3aa23b 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.test.tsx
@@ -82,4 +82,45 @@ describe('Settings Editor', () => {
       expect(settingsButtonEl.textContent).toBe(`Size: ${newSizeValue}`);
     });
   });
+
+  describe('Rate aggregation', () => {
+    it('should render correct settings', () => {
+      const metricId = '1';
+      const query: ElasticsearchQuery = {
+        refId: 'A',
+        query: '',
+        metrics: [
+          {
+            id: metricId,
+            type: 'rate',
+            settings: {},
+          },
+        ],
+        bucketAggs: [],
+      };
+
+      const onChange = jest.fn();
+
+      render(
+        <ElasticsearchProvider
+          query={query}
+          datasource={{} as ElasticDatasource}
+          onChange={onChange}
+          onRunQuery={() => {}}
+          range={getDefaultTimeRange()}
+        >
+          <SettingsEditor metric={query.metrics![0]} previousMetrics={[]} />
+        </ElasticsearchProvider>
+      );
+
+      let settingsButtonEl = screen.getByRole('button');
+      fireEvent.click(settingsButtonEl);
+
+      const unitSelectElement = screen.getByTestId('unit-select');
+      const modeSelectElement = screen.getByTestId('mode-select');
+
+      expect(unitSelectElement).toBeInTheDocument();
+      expect(modeSelectElement).toBeInTheDocument();
+    });
+  });
 });
diff --git a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
index 89a320a33b1..dadecbda697 100644
--- a/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
+++ b/public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/SettingsEditor/index.tsx
@@ -127,7 +127,7 @@ export const SettingsEditor: FunctionComponent<Props> = ({ metric, previousMetri
 
       {metric.type === 'rate' && (
         <>
-          <InlineField label="Unit" {...inlineFieldProps}>
+          <InlineField label="Unit" {...inlineFieldProps} data-testid="unit-select">
             <Select
               id={`ES-query-${query.refId}_metric-${metric.id}-unit`}
               onChange={(e) => dispatch(changeMetricSetting(metric, 'unit', e.value))}
@@ -136,7 +136,7 @@ export const SettingsEditor: FunctionComponent<Props> = ({ metric, previousMetri
             />
           </InlineField>
 
-          <InlineField label="Mode" {...inlineFieldProps}>
+          <InlineField label="Mode" {...inlineFieldProps} data-testid="mode-select">
             <Select
               id={`ES-query-${query.refId}_metric-${metric.id}-mode`}
               onChange={(e) => dispatch(changeMetricSetting(metric, 'mode', e.value))}