diff --git a/superset-frontend/spec/javascripts/dashboard/actions/dashboardLayout_spec.js b/superset-frontend/src/dashboard/actions/dashboardLayout.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/actions/dashboardLayout_spec.js
rename to superset-frontend/src/dashboard/actions/dashboardLayout.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/actions/dashboardState_spec.js b/superset-frontend/src/dashboard/actions/dashboardState.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/actions/dashboardState_spec.js
rename to superset-frontend/src/dashboard/actions/dashboardState.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/components/dnd/DragDroppable_spec.jsx b/superset-frontend/src/dashboard/components/dnd/DragDroppable.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/dnd/DragDroppable_spec.jsx
rename to superset-frontend/src/dashboard/components/dnd/DragDroppable.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Chart.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Chart_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Chart.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
similarity index 97%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
index 269da2f2f7ab4..1bf2ed375d3bb 100644
--- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/ChartHolder_spec.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
@@ -34,10 +34,10 @@ import ResizableContainer from 'src/dashboard/components/resizable/ResizableCont
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { sliceId } from 'spec/fixtures/mockChartQueries';
 import dashboardInfo from 'spec/fixtures/mockDashboardInfo';
+import { nativeFilters } from 'spec/fixtures/mockNativeFilters';
 import { dashboardLayout as mockLayout } from 'spec/fixtures/mockDashboardLayout';
 import { sliceEntitiesForChart } from 'spec/fixtures/mockSliceEntities';
 import { initialState } from 'src/SqlLab/fixtures';
-import { nativeFiltersInfo } from '../../fixtures/mockNativeFilters';
 
 describe('ChartHolder', () => {
   const props = {
@@ -57,7 +57,7 @@ describe('ChartHolder', () => {
     handleComponentDrop() {},
     updateComponents() {},
     deleteComponent() {},
-    nativeFilters: nativeFiltersInfo.filters,
+    nativeFilters: nativeFilters.filters,
   };
 
   function setup(overrideProps) {
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Column.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Column_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Column.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Divider_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Divider.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Divider_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Divider.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Header_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Header.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Header_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Header.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Markdown_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Markdown.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Markdown_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Markdown.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Row.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Row_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Row.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tab.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tab_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Tab.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/Tabs.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/DraggableNewComponent_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/DraggableNewComponent_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/DraggableNewComponent.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewColumn_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewColumn_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewColumn.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewDivider_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewDivider_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewDivider.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewHeader_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewHeader_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewHeader.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewRow_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewRow.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewRow_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewRow.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewTabs_spec.jsx b/superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/gridComponents/new/NewTabs_spec.jsx
rename to superset-frontend/src/dashboard/components/gridComponents/new/NewTabs.test.jsx