diff --git a/superset-frontend/spec/fixtures/mockState.js b/superset-frontend/spec/fixtures/mockState.js
index 2a3e2894f8e38..e492217e72b6d 100644
--- a/superset-frontend/spec/fixtures/mockState.js
+++ b/superset-frontend/spec/fixtures/mockState.js
@@ -21,7 +21,7 @@ import messageToasts from 'src/components/MessageToasts/mockMessageToasts';
 import {
   nativeFiltersInfo,
   mockDataMaskInfo,
-} from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+} from 'src/dashboard/fixtures/mockNativeFilters';
 import { user } from 'src/SqlLab/fixtures';
 import chartQueries from './mockChartQueries';
 import { dashboardLayout } from './mockDashboardLayout';
diff --git a/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx b/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx
index 3dab2b57595e6..561a531d0ca5b 100644
--- a/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx
+++ b/superset-frontend/spec/fixtures/mockStateWithoutUser.tsx
@@ -21,7 +21,7 @@ import messageToasts from 'src/components/MessageToasts/mockMessageToasts';
 import {
   nativeFiltersInfo,
   mockDataMaskInfo,
-} from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+} from 'src/dashboard/fixtures/mockNativeFilters';
 import chartQueries from 'spec/fixtures/mockChartQueries';
 import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout';
 import dashboardInfo from 'spec/fixtures/mockDashboardInfo';
diff --git a/superset-frontend/spec/javascripts/dashboard/components/Dashboard_spec.jsx b/superset-frontend/src/dashboard/components/Dashboard.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/Dashboard_spec.jsx
rename to superset-frontend/src/dashboard/components/Dashboard.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx b/superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/DashboardBuilder_spec.jsx
rename to superset-frontend/src/dashboard/components/DashboardBuilder/DashboardBuilder.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/DashboardGrid_spec.jsx b/superset-frontend/src/dashboard/components/DashboardGrid.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/DashboardGrid_spec.jsx
rename to superset-frontend/src/dashboard/components/DashboardGrid.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/FiltersBadge_spec.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/FiltersBadge.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/FiltersBadge_spec.tsx
rename to superset-frontend/src/dashboard/components/FiltersBadge/FiltersBadge.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/MissingChart_spec.tsx b/superset-frontend/src/dashboard/components/MissingChart.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/MissingChart_spec.tsx
rename to superset-frontend/src/dashboard/components/MissingChart.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/PropertiesModal_spec.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/PropertiesModal_spec.jsx
rename to superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.jsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/RefreshIntervalModal_spec.tsx b/superset-frontend/src/dashboard/components/RefreshIntervalModal.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/RefreshIntervalModal_spec.tsx
rename to superset-frontend/src/dashboard/components/RefreshIntervalModal.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/SliceAdder_spec.jsx b/superset-frontend/src/dashboard/components/SliceAdder.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/SliceAdder_spec.jsx
rename to superset-frontend/src/dashboard/components/SliceAdder.test.jsx
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
index 1bf2ed375d3bb..0c46b16de471b 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.jsx
@@ -18,9 +18,8 @@
  */
 import { Provider } from 'react-redux';
 import React from 'react';
-import { mount } from 'enzyme';
+import { styledMount as mount } from 'spec/helpers/theming';
 import sinon from 'sinon';
-import { supersetTheme, ThemeProvider } from '@superset-ui/core';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 
@@ -74,10 +73,6 @@ describe('ChartHolder', () => {
           <ChartHolderConnected {...props} {...overrideProps} />
         </DndProvider>
       </Provider>,
-      {
-        wrappingComponent: ThemeProvider,
-        wrappingComponentProps: { theme: supersetTheme },
-      },
     );
     return wrapper;
   }
diff --git a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
index 3db54d6381421..6268e96bd753f 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/ChartHolder.test.tsx
@@ -20,7 +20,7 @@
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 import { sliceId as chartId } from 'spec/fixtures/mockChartQueries';
-import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { nativeFiltersInfo } from 'src/dashboard/fixtures/mockNativeFilters';
 import newComponentFactory from 'src/dashboard/util/newComponentFactory';
 import { getMockStore } from 'spec/fixtures/mockStore';
 import { initialState } from 'src/SqlLab/fixtures';
diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
index d37d7936a601d..9ee9fc6866dbc 100644
--- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
+++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.test.tsx
@@ -20,7 +20,7 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { nativeFiltersInfo } from 'src/dashboard/fixtures/mockNativeFilters';
 import DashboardComponent from 'src/dashboard/containers/DashboardComponent';
 import DragDroppable from 'src/dashboard/components/dnd/DragDroppable';
 import DeleteComponentButton from 'src/dashboard/components/DeleteComponentButton';
diff --git a/superset-frontend/spec/javascripts/dashboard/components/menu/HoverMenu_spec.tsx b/superset-frontend/src/dashboard/components/menu/HoverMenu.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/menu/HoverMenu_spec.tsx
rename to superset-frontend/src/dashboard/components/menu/HoverMenu.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/menu/WithPopoverMenu_spec.jsx b/superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.jsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/menu/WithPopoverMenu_spec.jsx
rename to superset-frontend/src/dashboard/components/menu/WithPopoverMenu.test.jsx
diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/CascadeFilterControl.test.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/CascadeFilterControl.test.tsx
index c690c323d5b72..4d7d92cdff9ce 100644
--- a/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/CascadeFilterControl.test.tsx
+++ b/superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/CascadeFilterControl.test.tsx
@@ -20,7 +20,7 @@ import React from 'react';
 import { fireEvent, render, screen } from 'spec/helpers/testing-library';
 import { mockStore } from 'spec/fixtures/mockStore';
 import { Provider } from 'react-redux';
-import { nativeFiltersInfo } from 'spec/javascripts/dashboard/fixtures/mockNativeFilters';
+import { nativeFiltersInfo } from 'src/dashboard/fixtures/mockNativeFilters';
 import CascadeFilterControl, { CascadeFilterControlProps } from '.';
 
 const createProps = (defaultsId = nativeFiltersInfo.filters.DefaultsID) => ({
diff --git a/superset-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/NativeFiltersModal.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/nativeFilters/NativeFiltersModal_spec.tsx
rename to superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/NativeFiltersModal.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/resizable/ResizableContainer_spec.tsx b/superset-frontend/src/dashboard/components/resizable/ResizableContainer.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/resizable/ResizableContainer_spec.tsx
rename to superset-frontend/src/dashboard/components/resizable/ResizableContainer.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/components/resizable/ResizableHandle_spec.tsx b/superset-frontend/src/dashboard/components/resizable/ResizableHandle.test.tsx
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/components/resizable/ResizableHandle_spec.tsx
rename to superset-frontend/src/dashboard/components/resizable/ResizableHandle.test.tsx
diff --git a/superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts b/superset-frontend/src/dashboard/fixtures/mockNativeFilters.ts
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/fixtures/mockNativeFilters.ts
rename to superset-frontend/src/dashboard/fixtures/mockNativeFilters.ts
diff --git a/superset-frontend/spec/javascripts/dashboard/reducers/dashboardFilters_spec.js b/superset-frontend/src/dashboard/reducers/dashboardFilters.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/reducers/dashboardFilters_spec.js
rename to superset-frontend/src/dashboard/reducers/dashboardFilters.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/reducers/dashboardLayout_spec.js b/superset-frontend/src/dashboard/reducers/dashboardLayout.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/reducers/dashboardLayout_spec.js
rename to superset-frontend/src/dashboard/reducers/dashboardLayout.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/reducers/dashboardState_spec.js b/superset-frontend/src/dashboard/reducers/dashboardState.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/reducers/dashboardState_spec.js
rename to superset-frontend/src/dashboard/reducers/dashboardState.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/reducers/sliceEntities_spec.js b/superset-frontend/src/dashboard/reducers/sliceEntities.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/reducers/sliceEntities_spec.js
rename to superset-frontend/src/dashboard/reducers/sliceEntities.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/componentIsResizable_spec.ts b/superset-frontend/src/dashboard/util/componentIsResizable.test.ts
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/componentIsResizable_spec.ts
rename to superset-frontend/src/dashboard/util/componentIsResizable.test.ts
diff --git a/superset-frontend/spec/javascripts/dashboard/util/dnd-reorder_spec.js b/superset-frontend/src/dashboard/util/dnd-reorder.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/dnd-reorder_spec.js
rename to superset-frontend/src/dashboard/util/dnd-reorder.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/dropOverflowsParent_spec.js b/superset-frontend/src/dashboard/util/dropOverflowsParent.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/dropOverflowsParent_spec.js
rename to superset-frontend/src/dashboard/util/dropOverflowsParent.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/findFirstParentContainer_spec.js b/superset-frontend/src/dashboard/util/findFirstParentContainer.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/findFirstParentContainer_spec.js
rename to superset-frontend/src/dashboard/util/findFirstParentContainer.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/findParentId_spec.js b/superset-frontend/src/dashboard/util/findParentId.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/findParentId_spec.js
rename to superset-frontend/src/dashboard/util/findParentId.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/findTabIndexByComponentId_spec.js b/superset-frontend/src/dashboard/util/findTabIndexByComponentId.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/findTabIndexByComponentId_spec.js
rename to superset-frontend/src/dashboard/util/findTabIndexByComponentId.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getChartAndLabelComponentIdFromPath_spec.js b/superset-frontend/src/dashboard/util/getChartAndLabelComponentIdFromPath.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getChartAndLabelComponentIdFromPath_spec.js
rename to superset-frontend/src/dashboard/util/getChartAndLabelComponentIdFromPath.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getChartIdsFromLayout_spec.js b/superset-frontend/src/dashboard/util/getChartIdsFromLayout.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getChartIdsFromLayout_spec.js
rename to superset-frontend/src/dashboard/util/getChartIdsFromLayout.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js b/superset-frontend/src/dashboard/util/getDashboardUrl.test.js
similarity index 97%
rename from superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js
rename to superset-frontend/src/dashboard/util/getDashboardUrl.test.js
index 53904e1c6bf25..653c17de89a87 100644
--- a/superset-frontend/spec/javascripts/dashboard/util/getDashboardUrl_spec.js
+++ b/superset-frontend/src/dashboard/util/getDashboardUrl.test.js
@@ -18,7 +18,7 @@
  */
 import getDashboardUrl from 'src/dashboard/util/getDashboardUrl';
 import { DASHBOARD_FILTER_SCOPE_GLOBAL } from 'src/dashboard/reducers/dashboardFilters';
-import { DashboardStandaloneMode } from '../../../../src/dashboard/util/constants';
+import { DashboardStandaloneMode } from 'src/dashboard/util/constants';
 
 describe('getChartIdsFromLayout', () => {
   const filters = {
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getDetailedComponentWidth_spec.js b/superset-frontend/src/dashboard/util/getDetailedComponentWidth.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getDetailedComponentWidth_spec.js
rename to superset-frontend/src/dashboard/util/getDetailedComponentWidth.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getDropPosition_spec.js b/superset-frontend/src/dashboard/util/getDropPosition.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getDropPosition_spec.js
rename to superset-frontend/src/dashboard/util/getDropPosition.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js b/superset-frontend/src/dashboard/util/getEffectiveExtraFilters.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getEffectiveExtraFilters_spec.js
rename to superset-frontend/src/dashboard/util/getEffectiveExtraFilters.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getFilterConfigsFromFormdata_spec.js b/superset-frontend/src/dashboard/util/getFilterConfigsFromFormdata.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getFilterConfigsFromFormdata_spec.js
rename to superset-frontend/src/dashboard/util/getFilterConfigsFromFormdata.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getFilterScopeFromNodesTree_spec.js b/superset-frontend/src/dashboard/util/getFilterScopeFromNodesTree.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getFilterScopeFromNodesTree_spec.js
rename to superset-frontend/src/dashboard/util/getFilterScopeFromNodesTree.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts b/superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts
similarity index 95%
rename from superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
rename to superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts
index 2d385946afbef..d60efaa185b45 100644
--- a/superset-frontend/spec/javascripts/dashboard/util/getFormDataWithExtraFilters_spec.ts
+++ b/superset-frontend/src/dashboard/util/getFormDataWithExtraFilters.test.ts
@@ -22,8 +22,8 @@ import getFormDataWithExtraFilters, {
 import { DASHBOARD_ROOT_ID } from 'src/dashboard/util/constants';
 import { Filter } from 'src/dashboard/components/nativeFilters/types';
 import { LayoutItem } from 'src/dashboard/types';
-import { dashboardLayout } from '../../../fixtures/mockDashboardLayout';
-import { sliceId as chartId } from '../../../fixtures/mockChartQueries';
+import { dashboardLayout } from 'spec/fixtures/mockDashboardLayout';
+import { sliceId as chartId } from 'spec/fixtures/mockChartQueries';
 
 describe('getFormDataWithExtraFilters', () => {
   const filterId = 'native-filter-1';
diff --git a/superset-frontend/spec/javascripts/dashboard/util/getLeafComponentIdFromPath_spec.js b/superset-frontend/src/dashboard/util/getLeafComponentIdFromPath.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/getLeafComponentIdFromPath_spec.js
rename to superset-frontend/src/dashboard/util/getLeafComponentIdFromPath.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/isDashboardEmpty_spec.ts b/superset-frontend/src/dashboard/util/isDashboardEmpty.test.ts
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/isDashboardEmpty_spec.ts
rename to superset-frontend/src/dashboard/util/isDashboardEmpty.test.ts
diff --git a/superset-frontend/spec/javascripts/dashboard/util/isValidChild_spec.ts b/superset-frontend/src/dashboard/util/isValidChild.test.ts
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/isValidChild_spec.ts
rename to superset-frontend/src/dashboard/util/isValidChild.test.ts
diff --git a/superset-frontend/spec/javascripts/dashboard/util/newComponentFactory_spec.js b/superset-frontend/src/dashboard/util/newComponentFactory.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/newComponentFactory_spec.js
rename to superset-frontend/src/dashboard/util/newComponentFactory.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/newEntitiesFromDrop_spec.js b/superset-frontend/src/dashboard/util/newEntitiesFromDrop.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/newEntitiesFromDrop_spec.js
rename to superset-frontend/src/dashboard/util/newEntitiesFromDrop.test.js
diff --git a/superset-frontend/spec/javascripts/dashboard/util/updateComponentParentsList_spec.js b/superset-frontend/src/dashboard/util/updateComponentParentsList.test.js
similarity index 100%
rename from superset-frontend/spec/javascripts/dashboard/util/updateComponentParentsList_spec.js
rename to superset-frontend/src/dashboard/util/updateComponentParentsList.test.js