diff --git a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
index bdef06ad593..9b7eefc8af1 100644
--- a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
+++ b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx
@@ -84,7 +84,7 @@ describe('ChangeDatasourceModal', () => {
   });
 
   it('fetches datasources', async () => {
-    expect(fetchMock.calls(/api\/v1\/dataset/)).toHaveLength(3);
+    expect(fetchMock.calls(/api\/v1\/dataset\/\\?q*/)).toHaveLength(3);
   });
 
   it('renders confirmation message', async () => {
diff --git a/superset-frontend/src/components/ChartIcon.tsx b/superset-frontend/src/components/ChartIcon/index.tsx
similarity index 100%
rename from superset-frontend/src/components/ChartIcon.tsx
rename to superset-frontend/src/components/ChartIcon/index.tsx