diff --git a/frontend/test/admin/databases/DatabaseEditApp.e2e.spec.js b/frontend/test/metabase/admin/databases/DatabaseEditApp.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/databases/DatabaseEditApp.e2e.spec.js
rename to frontend/test/metabase/admin/databases/DatabaseEditApp.e2e.spec.js
diff --git a/frontend/test/admin/databases/DatabaseListApp.e2e.spec.js b/frontend/test/metabase/admin/databases/DatabaseListApp.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/databases/DatabaseListApp.e2e.spec.js
rename to frontend/test/metabase/admin/databases/DatabaseListApp.e2e.spec.js
diff --git a/frontend/test/admin/datamodel/FieldApp.e2e.spec.js b/frontend/test/metabase/admin/datamodel/FieldApp.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/datamodel/FieldApp.e2e.spec.js
rename to frontend/test/metabase/admin/datamodel/FieldApp.e2e.spec.js
diff --git a/frontend/test/admin/datamodel/datamodel.e2e.spec.js b/frontend/test/metabase/admin/datamodel/datamodel.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/datamodel/datamodel.e2e.spec.js
rename to frontend/test/metabase/admin/datamodel/datamodel.e2e.spec.js
diff --git a/frontend/test/admin/people/people.e2e.spec.js b/frontend/test/metabase/admin/people/people.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/people/people.e2e.spec.js
rename to frontend/test/metabase/admin/people/people.e2e.spec.js
diff --git a/frontend/test/admin/permissions/selectors.unit.spec.fixtures.js b/frontend/test/metabase/admin/permissions/selectors.unit.spec.fixtures.js
similarity index 100%
rename from frontend/test/admin/permissions/selectors.unit.spec.fixtures.js
rename to frontend/test/metabase/admin/permissions/selectors.unit.spec.fixtures.js
diff --git a/frontend/test/admin/permissions/selectors.unit.spec.js b/frontend/test/metabase/admin/permissions/selectors.unit.spec.js
similarity index 100%
rename from frontend/test/admin/permissions/selectors.unit.spec.js
rename to frontend/test/metabase/admin/permissions/selectors.unit.spec.js
diff --git a/frontend/test/admin/settings/SettingsAuthenticationOptions.e2e.spec.js b/frontend/test/metabase/admin/settings/SettingsAuthenticationOptions.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/settings/SettingsAuthenticationOptions.e2e.spec.js
rename to frontend/test/metabase/admin/settings/SettingsAuthenticationOptions.e2e.spec.js
diff --git a/frontend/test/admin/settings/settings.e2e.spec.js b/frontend/test/metabase/admin/settings/settings.e2e.spec.js
similarity index 100%
rename from frontend/test/admin/settings/settings.e2e.spec.js
rename to frontend/test/metabase/admin/settings/settings.e2e.spec.js
diff --git a/frontend/test/admin/settings/utils.unit.spec.js b/frontend/test/metabase/admin/settings/utils.unit.spec.js
similarity index 89%
rename from frontend/test/admin/settings/utils.unit.spec.js
rename to frontend/test/metabase/admin/settings/utils.unit.spec.js
index 583b4f7925473187e7b024ee70c63525dfbd7017..8aff87a8ae844a3e4e18ddd2cd828cf1ebcfee44 100644
--- a/frontend/test/admin/settings/utils.unit.spec.js
+++ b/frontend/test/metabase/admin/settings/utils.unit.spec.js
@@ -1,4 +1,4 @@
-import { prepareAnalyticsValue } from "../../../src/metabase/admin/settings/utils";
+import { prepareAnalyticsValue } from "metabase/admin/settings/utils";
 
 describe("prepareAnalyticsValue", () => {
   const defaultSetting = { value: 120, type: "number" };
diff --git a/frontend/test/alert/alert.e2e.spec.js b/frontend/test/metabase/alert/alert.e2e.spec.js
similarity index 100%
rename from frontend/test/alert/alert.e2e.spec.js
rename to frontend/test/metabase/alert/alert.e2e.spec.js
diff --git a/frontend/test/collection/initial_collection.e2e.spec.js b/frontend/test/metabase/collection/initial_collection.e2e.spec.js
similarity index 100%
rename from frontend/test/collection/initial_collection.e2e.spec.js
rename to frontend/test/metabase/collection/initial_collection.e2e.spec.js
diff --git a/frontend/test/components/AccordianList.unit.test.js b/frontend/test/metabase/components/AccordianList.unit.test.js
similarity index 100%
rename from frontend/test/components/AccordianList.unit.test.js
rename to frontend/test/metabase/components/AccordianList.unit.test.js
diff --git a/frontend/test/components/Button.unit.spec.js b/frontend/test/metabase/components/Button.unit.spec.js
similarity index 92%
rename from frontend/test/components/Button.unit.spec.js
rename to frontend/test/metabase/components/Button.unit.spec.js
index 80b8b057dbf3fc77a99954477950e9251fe3cd83..6f31b2a732a9cd2e344f2a69acacece5049a9f66 100644
--- a/frontend/test/components/Button.unit.spec.js
+++ b/frontend/test/metabase/components/Button.unit.spec.js
@@ -3,7 +3,7 @@ import renderer from "react-test-renderer";
 
 import { render } from "enzyme";
 
-import Button from "../../src/metabase/components/Button";
+import Button from "metabase/components/Button";
 
 describe("Button", () => {
   it("should render correctly", () => {
diff --git a/frontend/test/components/Calendar.unit.test.js b/frontend/test/metabase/components/Calendar.unit.test.js
similarity index 94%
rename from frontend/test/components/Calendar.unit.test.js
rename to frontend/test/metabase/components/Calendar.unit.test.js
index 8cca46d8ed034025f56e5a43e0d1ac6ca9f7998d..7bc94deddeb5592e22e4c4261046b19cc2aa62bf 100644
--- a/frontend/test/components/Calendar.unit.test.js
+++ b/frontend/test/metabase/components/Calendar.unit.test.js
@@ -4,7 +4,7 @@ import moment from "moment";
 import mockDate from "mockdate";
 import { mount } from "enzyme";
 
-import Calendar from "../../src/metabase/components/Calendar";
+import Calendar from "metabase/components/Calendar";
 
 describe("Calendar", () => {
   afterEach(() => {
diff --git a/frontend/test/components/EntityMenuItem.unit.test.js b/frontend/test/metabase/components/EntityMenuItem.unit.test.js
similarity index 100%
rename from frontend/test/components/EntityMenuItem.unit.test.js
rename to frontend/test/metabase/components/EntityMenuItem.unit.test.js
diff --git a/frontend/test/components/EntityMenuTrigger.unit.test.js b/frontend/test/metabase/components/EntityMenuTrigger.unit.test.js
similarity index 100%
rename from frontend/test/components/EntityMenuTrigger.unit.test.js
rename to frontend/test/metabase/components/EntityMenuTrigger.unit.test.js
diff --git a/frontend/test/components/FieldValuesWidget.unit.spec.js b/frontend/test/metabase/components/FieldValuesWidget.unit.spec.js
similarity index 95%
rename from frontend/test/components/FieldValuesWidget.unit.spec.js
rename to frontend/test/metabase/components/FieldValuesWidget.unit.spec.js
index d2f54abada422b45d28aefb90c6f9ea331817d3c..c93d647b931428609c5bcb9d71a0861cebb2d309 100644
--- a/frontend/test/components/FieldValuesWidget.unit.spec.js
+++ b/frontend/test/metabase/components/FieldValuesWidget.unit.spec.js
@@ -5,10 +5,10 @@ import {
   metadata,
   PRODUCT_CATEGORY_FIELD_ID,
   ORDERS_PRODUCT_FK_FIELD_ID,
-} from "../__support__/sample_dataset_fixture";
+} from "__support__/sample_dataset_fixture";
 
-import { FieldValuesWidget } from "../../src/metabase/components/FieldValuesWidget";
-import TokenField from "../../src/metabase/components/TokenField";
+import { FieldValuesWidget } from "metabase/components/FieldValuesWidget";
+import TokenField from "metabase/components/TokenField";
 
 const mock = (object, properties) =>
   Object.assign(Object.create(object), properties);
diff --git a/frontend/test/components/Icon.unit.test.js b/frontend/test/metabase/components/Icon.unit.test.js
similarity index 100%
rename from frontend/test/components/Icon.unit.test.js
rename to frontend/test/metabase/components/Icon.unit.test.js
diff --git a/frontend/test/components/LoadingAndErrorWrapper.unit.spec.js b/frontend/test/metabase/components/LoadingAndErrorWrapper.unit.spec.js
similarity index 100%
rename from frontend/test/components/LoadingAndErrorWrapper.unit.spec.js
rename to frontend/test/metabase/components/LoadingAndErrorWrapper.unit.spec.js
diff --git a/frontend/test/components/Logs.unit.spec.js b/frontend/test/metabase/components/Logs.unit.spec.js
similarity index 89%
rename from frontend/test/components/Logs.unit.spec.js
rename to frontend/test/metabase/components/Logs.unit.spec.js
index 0c1f1becf7e1d9dbb3880a524ae8e3eba847b9b1..952bdde28b54b22a11810192942d3b6dc2cddb1d 100644
--- a/frontend/test/components/Logs.unit.spec.js
+++ b/frontend/test/metabase/components/Logs.unit.spec.js
@@ -1,5 +1,5 @@
 import React from "react";
-import Logs from "../../src/metabase/components/Logs";
+import Logs from "metabase/components/Logs";
 import { mount } from "enzyme";
 
 import { UtilApi } from "metabase/services";
diff --git a/frontend/test/components/PasswordReveal.unit.spec.js b/frontend/test/metabase/components/PasswordReveal.unit.spec.js
similarity index 89%
rename from frontend/test/components/PasswordReveal.unit.spec.js
rename to frontend/test/metabase/components/PasswordReveal.unit.spec.js
index abc9b4dcaae25cffc499c32df852c34fb6aad38a..3109a53950f6db3d4d511290c652b1407a0bf14e 100644
--- a/frontend/test/components/PasswordReveal.unit.spec.js
+++ b/frontend/test/metabase/components/PasswordReveal.unit.spec.js
@@ -1,7 +1,7 @@
 import { click } from "__support__/enzyme_utils";
 
 import React from "react";
-import PasswordReveal from "../../src/metabase/components/PasswordReveal";
+import PasswordReveal from "metabase/components/PasswordReveal";
 import CopyButton from "metabase/components/CopyButton";
 
 import { shallow } from "enzyme";
diff --git a/frontend/test/components/StepIndicators.unit.spec.js b/frontend/test/metabase/components/StepIndicators.unit.spec.js
similarity index 93%
rename from frontend/test/components/StepIndicators.unit.spec.js
rename to frontend/test/metabase/components/StepIndicators.unit.spec.js
index d324db18077b393fdeb48e58353b1749e4488647..e13de988696960d3dab7592cbc9159ff6de2740b 100644
--- a/frontend/test/components/StepIndicators.unit.spec.js
+++ b/frontend/test/metabase/components/StepIndicators.unit.spec.js
@@ -5,7 +5,7 @@ import { shallow } from "enzyme";
 
 import { normal } from "metabase/lib/colors";
 
-import StepIndicators from "../../src/metabase/components/StepIndicators";
+import StepIndicators from "metabase/components/StepIndicators";
 
 describe("Step indicators", () => {
   let steps = [{}, {}, {}];
diff --git a/frontend/test/components/TokenField.unit.spec.js b/frontend/test/metabase/components/TokenField.unit.spec.js
similarity index 99%
rename from frontend/test/components/TokenField.unit.spec.js
rename to frontend/test/metabase/components/TokenField.unit.spec.js
index aa24ae1fbe27de93d9120ae461afaff64827c185..838a0a3b972d02c98adccc7fd646a6b6ce0c4cf0 100644
--- a/frontend/test/components/TokenField.unit.spec.js
+++ b/frontend/test/metabase/components/TokenField.unit.spec.js
@@ -3,9 +3,9 @@
 import React from "react";
 import { mount } from "enzyme";
 
-import TokenField from "../../src/metabase/components/TokenField";
+import TokenField from "metabase/components/TokenField";
 
-import { delay } from "../../src/metabase/lib/promise";
+import { delay } from "metabase/lib/promise";
 
 import {
   KEYCODE_DOWN,
diff --git a/frontend/test/components/__snapshots__/Button.unit.spec.js.snap b/frontend/test/metabase/components/__snapshots__/Button.unit.spec.js.snap
similarity index 100%
rename from frontend/test/components/__snapshots__/Button.unit.spec.js.snap
rename to frontend/test/metabase/components/__snapshots__/Button.unit.spec.js.snap
diff --git a/frontend/test/components/__snapshots__/Calendar.unit.test.js.snap b/frontend/test/metabase/components/__snapshots__/Calendar.unit.test.js.snap
similarity index 100%
rename from frontend/test/components/__snapshots__/Calendar.unit.test.js.snap
rename to frontend/test/metabase/components/__snapshots__/Calendar.unit.test.js.snap
diff --git a/frontend/test/containers/AdHocQuestionLoader.unit.spec.js b/frontend/test/metabase/containers/AdHocQuestionLoader.unit.spec.js
similarity index 100%
rename from frontend/test/containers/AdHocQuestionLoader.unit.spec.js
rename to frontend/test/metabase/containers/AdHocQuestionLoader.unit.spec.js
diff --git a/frontend/test/containers/Overworld.unit.spec.js b/frontend/test/metabase/containers/Overworld.unit.spec.js
similarity index 100%
rename from frontend/test/containers/Overworld.unit.spec.js
rename to frontend/test/metabase/containers/Overworld.unit.spec.js
diff --git a/frontend/test/containers/QuestionAndResultLoader.unit.spec.js b/frontend/test/metabase/containers/QuestionAndResultLoader.unit.spec.js
similarity index 100%
rename from frontend/test/containers/QuestionAndResultLoader.unit.spec.js
rename to frontend/test/metabase/containers/QuestionAndResultLoader.unit.spec.js
diff --git a/frontend/test/containers/QuestionLoader.unit.spec.js b/frontend/test/metabase/containers/QuestionLoader.unit.spec.js
similarity index 100%
rename from frontend/test/containers/QuestionLoader.unit.spec.js
rename to frontend/test/metabase/containers/QuestionLoader.unit.spec.js
diff --git a/frontend/test/containers/QuestionResultLoader.unit.spec.js b/frontend/test/metabase/containers/QuestionResultLoader.unit.spec.js
similarity index 100%
rename from frontend/test/containers/QuestionResultLoader.unit.spec.js
rename to frontend/test/metabase/containers/QuestionResultLoader.unit.spec.js
diff --git a/frontend/test/containers/SaveQuestionModal.unit.spec.js b/frontend/test/metabase/containers/SaveQuestionModal.unit.spec.js
similarity index 97%
rename from frontend/test/containers/SaveQuestionModal.unit.spec.js
rename to frontend/test/metabase/containers/SaveQuestionModal.unit.spec.js
index 11494be72d51b7744db8c0b1fc5a07f7da153695..ee0063bf696a5dee8c57cdcb390921f912d6c7ef 100644
--- a/frontend/test/containers/SaveQuestionModal.unit.spec.js
+++ b/frontend/test/metabase/containers/SaveQuestionModal.unit.spec.js
@@ -1,7 +1,7 @@
 import React from "react";
 import { shallow } from "enzyme";
 
-import SaveQuestionModal from "../../src/metabase/containers/SaveQuestionModal";
+import SaveQuestionModal from "metabase/containers/SaveQuestionModal";
 import Question from "metabase-lib/lib/Question";
 
 import {
diff --git a/frontend/test/containers/SavedQuestionLoader.unit.spec.js b/frontend/test/metabase/containers/SavedQuestionLoader.unit.spec.js
similarity index 100%
rename from frontend/test/containers/SavedQuestionLoader.unit.spec.js
rename to frontend/test/metabase/containers/SavedQuestionLoader.unit.spec.js
diff --git a/frontend/test/dashboard/DashCard.unit.spec.js b/frontend/test/metabase/dashboard/DashCard.unit.spec.js
similarity index 100%
rename from frontend/test/dashboard/DashCard.unit.spec.js
rename to frontend/test/metabase/dashboard/DashCard.unit.spec.js
diff --git a/frontend/test/dashboard/__snapshots__/DashCard.unit.spec.js.snap b/frontend/test/metabase/dashboard/__snapshots__/DashCard.unit.spec.js.snap
similarity index 100%
rename from frontend/test/dashboard/__snapshots__/DashCard.unit.spec.js.snap
rename to frontend/test/metabase/dashboard/__snapshots__/DashCard.unit.spec.js.snap
diff --git a/frontend/test/dashboard/dashboard.e2e.spec.js b/frontend/test/metabase/dashboard/dashboard.e2e.spec.js
similarity index 100%
rename from frontend/test/dashboard/dashboard.e2e.spec.js
rename to frontend/test/metabase/dashboard/dashboard.e2e.spec.js
diff --git a/frontend/test/dashboard/dashboard.unit.spec.js b/frontend/test/metabase/dashboard/dashboard.unit.spec.js
similarity index 100%
rename from frontend/test/dashboard/dashboard.unit.spec.js
rename to frontend/test/metabase/dashboard/dashboard.unit.spec.js
diff --git a/frontend/test/dashboard/selectors.unit.spec.js b/frontend/test/metabase/dashboard/selectors.unit.spec.js
similarity index 100%
rename from frontend/test/dashboard/selectors.unit.spec.js
rename to frontend/test/metabase/dashboard/selectors.unit.spec.js
diff --git a/frontend/test/dashboards/dashboards.e2e.spec.js b/frontend/test/metabase/dashboards/dashboards.e2e.spec.js
similarity index 100%
rename from frontend/test/dashboards/dashboards.e2e.spec.js
rename to frontend/test/metabase/dashboards/dashboards.e2e.spec.js
diff --git a/frontend/test/entities/containers/EntityListLoader.unit.spec.js b/frontend/test/metabase/entities/containers/EntityListLoader.unit.spec.js
similarity index 100%
rename from frontend/test/entities/containers/EntityListLoader.unit.spec.js
rename to frontend/test/metabase/entities/containers/EntityListLoader.unit.spec.js
diff --git a/frontend/test/hoc/Background.unit.spec.js b/frontend/test/metabase/hoc/Background.unit.spec.js
similarity index 100%
rename from frontend/test/hoc/Background.unit.spec.js
rename to frontend/test/metabase/hoc/Background.unit.spec.js
diff --git a/frontend/test/home/HomepageApp.e2e.spec.js b/frontend/test/metabase/home/HomepageApp.e2e.spec.js
similarity index 100%
rename from frontend/test/home/HomepageApp.e2e.spec.js
rename to frontend/test/metabase/home/HomepageApp.e2e.spec.js
diff --git a/frontend/test/home/NewUserOnboardingModal.unit.spec.js b/frontend/test/metabase/home/NewUserOnboardingModal.unit.spec.js
similarity index 90%
rename from frontend/test/home/NewUserOnboardingModal.unit.spec.js
rename to frontend/test/metabase/home/NewUserOnboardingModal.unit.spec.js
index 9673f3ac46a9cf071d83c3179f63261fd4d7be1b..c1a2d9d769299b6bafea6d7fb5b87d1ea5254f54 100644
--- a/frontend/test/home/NewUserOnboardingModal.unit.spec.js
+++ b/frontend/test/metabase/home/NewUserOnboardingModal.unit.spec.js
@@ -2,7 +2,7 @@ import { click } from "__support__/enzyme_utils";
 
 import React from "react";
 import { shallow } from "enzyme";
-import NewUserOnboardingModal from "../../src/metabase/home/components/NewUserOnboardingModal";
+import NewUserOnboardingModal from "metabase/home/components/NewUserOnboardingModal";
 
 describe("new user onboarding modal", () => {
   describe("advance steps", () => {
diff --git a/frontend/test/internal/__snapshots__/components.unit.spec.js.snap b/frontend/test/metabase/internal/__snapshots__/components.unit.spec.js.snap
similarity index 100%
rename from frontend/test/internal/__snapshots__/components.unit.spec.js.snap
rename to frontend/test/metabase/internal/__snapshots__/components.unit.spec.js.snap
diff --git a/frontend/test/internal/components.unit.spec.js b/frontend/test/metabase/internal/components.unit.spec.js
similarity index 100%
rename from frontend/test/internal/components.unit.spec.js
rename to frontend/test/metabase/internal/components.unit.spec.js
diff --git a/frontend/test/lib/api.unit.spec.js b/frontend/test/metabase/lib/api.unit.spec.js
similarity index 100%
rename from frontend/test/lib/api.unit.spec.js
rename to frontend/test/metabase/lib/api.unit.spec.js
diff --git a/frontend/test/lib/browser.unit.spec.js b/frontend/test/metabase/lib/browser.unit.spec.js
similarity index 100%
rename from frontend/test/lib/browser.unit.spec.js
rename to frontend/test/metabase/lib/browser.unit.spec.js
diff --git a/frontend/test/lib/card.unit.spec.js b/frontend/test/metabase/lib/card.unit.spec.js
similarity index 99%
rename from frontend/test/lib/card.unit.spec.js
rename to frontend/test/metabase/lib/card.unit.spec.js
index c1608cdf27192ee8e5ddb7d2a0b7d5824c67719f..5d16bdd08c32862ea74ee9d32e97eb5dd2a23c65 100644
--- a/frontend/test/lib/card.unit.spec.js
+++ b/frontend/test/metabase/lib/card.unit.spec.js
@@ -7,7 +7,7 @@ import {
   isCardDirty,
   serializeCardForUrl,
   deserializeCardFromUrl,
-} from "../../src/metabase/lib/card";
+} from "metabase/lib/card";
 
 const CARD_ID = 31;
 
diff --git a/frontend/test/lib/colors.unit.spec.js b/frontend/test/metabase/lib/colors.unit.spec.js
similarity index 100%
rename from frontend/test/lib/colors.unit.spec.js
rename to frontend/test/metabase/lib/colors.unit.spec.js
diff --git a/frontend/test/lib/dashboard_grid.unit.spec.js b/frontend/test/metabase/lib/dashboard_grid.unit.spec.js
similarity index 100%
rename from frontend/test/lib/dashboard_grid.unit.spec.js
rename to frontend/test/metabase/lib/dashboard_grid.unit.spec.js
diff --git a/frontend/test/lib/data_grid.unit.spec.js b/frontend/test/metabase/lib/data_grid.unit.spec.js
similarity index 100%
rename from frontend/test/lib/data_grid.unit.spec.js
rename to frontend/test/metabase/lib/data_grid.unit.spec.js
diff --git a/frontend/test/lib/expressions/formatter.unit.spec.js b/frontend/test/metabase/lib/expressions/formatter.unit.spec.js
similarity index 100%
rename from frontend/test/lib/expressions/formatter.unit.spec.js
rename to frontend/test/metabase/lib/expressions/formatter.unit.spec.js
diff --git a/frontend/test/lib/expressions/parser.unit.spec.js b/frontend/test/metabase/lib/expressions/parser.unit.spec.js
similarity index 100%
rename from frontend/test/lib/expressions/parser.unit.spec.js
rename to frontend/test/metabase/lib/expressions/parser.unit.spec.js
diff --git a/frontend/test/lib/formatting.unit.spec.js b/frontend/test/metabase/lib/formatting.unit.spec.js
similarity index 100%
rename from frontend/test/lib/formatting.unit.spec.js
rename to frontend/test/metabase/lib/formatting.unit.spec.js
diff --git a/frontend/test/lib/query.unit.spec.js b/frontend/test/metabase/lib/query.unit.spec.js
similarity index 100%
rename from frontend/test/lib/query.unit.spec.js
rename to frontend/test/metabase/lib/query.unit.spec.js
diff --git a/frontend/test/lib/query/query.unit.spec.js b/frontend/test/metabase/lib/query/query.unit.spec.js
similarity index 100%
rename from frontend/test/lib/query/query.unit.spec.js
rename to frontend/test/metabase/lib/query/query.unit.spec.js
diff --git a/frontend/test/lib/query_time.unit.spec.js b/frontend/test/metabase/lib/query_time.unit.spec.js
similarity index 100%
rename from frontend/test/lib/query_time.unit.spec.js
rename to frontend/test/metabase/lib/query_time.unit.spec.js
diff --git a/frontend/test/lib/redux.unit.spec.js b/frontend/test/metabase/lib/redux.unit.spec.js
similarity index 100%
rename from frontend/test/lib/redux.unit.spec.js
rename to frontend/test/metabase/lib/redux.unit.spec.js
diff --git a/frontend/test/lib/schema_metadata.unit.spec.js b/frontend/test/metabase/lib/schema_metadata.unit.spec.js
similarity index 100%
rename from frontend/test/lib/schema_metadata.unit.spec.js
rename to frontend/test/metabase/lib/schema_metadata.unit.spec.js
diff --git a/frontend/test/lib/time.unit.spec.js b/frontend/test/metabase/lib/time.unit.spec.js
similarity index 100%
rename from frontend/test/lib/time.unit.spec.js
rename to frontend/test/metabase/lib/time.unit.spec.js
diff --git a/frontend/test/lib/urls.unit.spec.js b/frontend/test/metabase/lib/urls.unit.spec.js
similarity index 100%
rename from frontend/test/lib/urls.unit.spec.js
rename to frontend/test/metabase/lib/urls.unit.spec.js
diff --git a/frontend/test/lib/utils.unit.spec.js b/frontend/test/metabase/lib/utils.unit.spec.js
similarity index 100%
rename from frontend/test/lib/utils.unit.spec.js
rename to frontend/test/metabase/lib/utils.unit.spec.js
diff --git a/frontend/test/meta/Card.unit.spec.js b/frontend/test/metabase/meta/Card.unit.spec.js
similarity index 100%
rename from frontend/test/meta/Card.unit.spec.js
rename to frontend/test/metabase/meta/Card.unit.spec.js
diff --git a/frontend/test/meta/Parameter.unit.spec.js b/frontend/test/metabase/meta/Parameter.unit.spec.js
similarity index 100%
rename from frontend/test/meta/Parameter.unit.spec.js
rename to frontend/test/metabase/meta/Parameter.unit.spec.js
diff --git a/frontend/test/modes/TimeseriesFilterWidget.unit.spec.jsx b/frontend/test/metabase/modes/TimeseriesFilterWidget.unit.spec.jsx
similarity index 100%
rename from frontend/test/modes/TimeseriesFilterWidget.unit.spec.jsx
rename to frontend/test/metabase/modes/TimeseriesFilterWidget.unit.spec.jsx
diff --git a/frontend/test/modes/TimeseriesMode.unit.spec.js b/frontend/test/metabase/modes/TimeseriesMode.unit.spec.js
similarity index 100%
rename from frontend/test/modes/TimeseriesMode.unit.spec.js
rename to frontend/test/metabase/modes/TimeseriesMode.unit.spec.js
diff --git a/frontend/test/modes/actions/CommonMetricsAction.e2e.spec.js b/frontend/test/metabase/modes/actions/CommonMetricsAction.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/actions/CommonMetricsAction.e2e.spec.js
rename to frontend/test/metabase/modes/actions/CommonMetricsAction.e2e.spec.js
diff --git a/frontend/test/modes/actions/CommonMetricsAction.unit.spec.js b/frontend/test/metabase/modes/actions/CommonMetricsAction.unit.spec.js
similarity index 100%
rename from frontend/test/modes/actions/CommonMetricsAction.unit.spec.js
rename to frontend/test/metabase/modes/actions/CommonMetricsAction.unit.spec.js
diff --git a/frontend/test/modes/actions/CompoundQueryAction.unit.spec.js b/frontend/test/metabase/modes/actions/CompoundQueryAction.unit.spec.js
similarity index 92%
rename from frontend/test/modes/actions/CompoundQueryAction.unit.spec.js
rename to frontend/test/metabase/modes/actions/CompoundQueryAction.unit.spec.js
index 28214d3f62ec91c7e2c41eeba44518194d57a6ff..6cf6a4f87579289dbc085a6c5598e97fdaaf9596 100644
--- a/frontend/test/modes/actions/CompoundQueryAction.unit.spec.js
+++ b/frontend/test/metabase/modes/actions/CompoundQueryAction.unit.spec.js
@@ -1,6 +1,6 @@
 /* eslint-disable flowtype/require-valid-file-annotation */
 
-import CompoundQueryAction from "../../../src/metabase/qb/components/actions/CompoundQueryAction";
+import CompoundQueryAction from "metabase/qb/components/actions/CompoundQueryAction";
 
 import Question from "metabase-lib/lib/Question";
 
diff --git a/frontend/test/modes/actions/CountByTimeAction.e2e.spec.js b/frontend/test/metabase/modes/actions/CountByTimeAction.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/actions/CountByTimeAction.e2e.spec.js
rename to frontend/test/metabase/modes/actions/CountByTimeAction.e2e.spec.js
diff --git a/frontend/test/modes/actions/CountByTimeAction.unit.spec.js b/frontend/test/metabase/modes/actions/CountByTimeAction.unit.spec.js
similarity index 100%
rename from frontend/test/modes/actions/CountByTimeAction.unit.spec.js
rename to frontend/test/metabase/modes/actions/CountByTimeAction.unit.spec.js
diff --git a/frontend/test/modes/actions/SummarizeBySegmentMetricAction.unit.spec.js b/frontend/test/metabase/modes/actions/SummarizeBySegmentMetricAction.unit.spec.js
similarity index 100%
rename from frontend/test/modes/actions/SummarizeBySegmentMetricAction.unit.spec.js
rename to frontend/test/metabase/modes/actions/SummarizeBySegmentMetricAction.unit.spec.js
diff --git a/frontend/test/modes/drills/ObjectDetailDrill.unit.spec.js b/frontend/test/metabase/modes/drills/ObjectDetailDrill.unit.spec.js
similarity index 100%
rename from frontend/test/modes/drills/ObjectDetailDrill.unit.spec.js
rename to frontend/test/metabase/modes/drills/ObjectDetailDrill.unit.spec.js
diff --git a/frontend/test/modes/drills/PivotByCategoryDrill.e2e.spec.js b/frontend/test/metabase/modes/drills/PivotByCategoryDrill.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/drills/PivotByCategoryDrill.e2e.spec.js
rename to frontend/test/metabase/modes/drills/PivotByCategoryDrill.e2e.spec.js
diff --git a/frontend/test/modes/drills/QuickFilterDrill.e2e.spec.js b/frontend/test/metabase/modes/drills/QuickFilterDrill.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/drills/QuickFilterDrill.e2e.spec.js
rename to frontend/test/metabase/modes/drills/QuickFilterDrill.e2e.spec.js
diff --git a/frontend/test/modes/drills/SortAction.e2e.spec.js b/frontend/test/metabase/modes/drills/SortAction.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/drills/SortAction.e2e.spec.js
rename to frontend/test/metabase/modes/drills/SortAction.e2e.spec.js
diff --git a/frontend/test/modes/drills/SummarizeColumnByTimeDrill.e2e.spec.js b/frontend/test/metabase/modes/drills/SummarizeColumnByTimeDrill.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/drills/SummarizeColumnByTimeDrill.e2e.spec.js
rename to frontend/test/metabase/modes/drills/SummarizeColumnByTimeDrill.e2e.spec.js
diff --git a/frontend/test/modes/drills/SummarizeColumnByTimeDrill.unit.spec.js b/frontend/test/metabase/modes/drills/SummarizeColumnByTimeDrill.unit.spec.js
similarity index 100%
rename from frontend/test/modes/drills/SummarizeColumnByTimeDrill.unit.spec.js
rename to frontend/test/metabase/modes/drills/SummarizeColumnByTimeDrill.unit.spec.js
diff --git a/frontend/test/modes/drills/SummarizeColumnDrill.e2e.spec.js b/frontend/test/metabase/modes/drills/SummarizeColumnDrill.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/drills/SummarizeColumnDrill.e2e.spec.js
rename to frontend/test/metabase/modes/drills/SummarizeColumnDrill.e2e.spec.js
diff --git a/frontend/test/modes/drills/SummarizeColumnDrill.unit.spec.js b/frontend/test/metabase/modes/drills/SummarizeColumnDrill.unit.spec.js
similarity index 100%
rename from frontend/test/modes/drills/SummarizeColumnDrill.unit.spec.js
rename to frontend/test/metabase/modes/drills/SummarizeColumnDrill.unit.spec.js
diff --git a/frontend/test/modes/drills/TimeseriesPivotDrill.e2e.spec.js b/frontend/test/metabase/modes/drills/TimeseriesPivotDrill.e2e.spec.js
similarity index 100%
rename from frontend/test/modes/drills/TimeseriesPivotDrill.e2e.spec.js
rename to frontend/test/metabase/modes/drills/TimeseriesPivotDrill.e2e.spec.js
diff --git a/frontend/test/modes/drills/UnderlyingRecordsDrill.unit.spec.js b/frontend/test/metabase/modes/drills/UnderlyingRecordsDrill.unit.spec.js
similarity index 100%
rename from frontend/test/modes/drills/UnderlyingRecordsDrill.unit.spec.js
rename to frontend/test/metabase/modes/drills/UnderlyingRecordsDrill.unit.spec.js
diff --git a/frontend/test/modes/drills/ZoomDrill.unit.spec.js b/frontend/test/metabase/modes/drills/ZoomDrill.unit.spec.js
similarity index 100%
rename from frontend/test/modes/drills/ZoomDrill.unit.spec.js
rename to frontend/test/metabase/modes/drills/ZoomDrill.unit.spec.js
diff --git a/frontend/test/modes/lib/actions.unit.spec.js b/frontend/test/metabase/modes/lib/actions.unit.spec.js
similarity index 100%
rename from frontend/test/modes/lib/actions.unit.spec.js
rename to frontend/test/metabase/modes/lib/actions.unit.spec.js
diff --git a/frontend/test/modes/lib/drilldown.unit.spec.js b/frontend/test/metabase/modes/lib/drilldown.unit.spec.js
similarity index 98%
rename from frontend/test/modes/lib/drilldown.unit.spec.js
rename to frontend/test/metabase/modes/lib/drilldown.unit.spec.js
index 7089a162a0509781498178500ca7ff0dcb847580..8d308360c41ae865eed86291bc63e829380eedfa 100644
--- a/frontend/test/modes/lib/drilldown.unit.spec.js
+++ b/frontend/test/metabase/modes/lib/drilldown.unit.spec.js
@@ -9,7 +9,7 @@ import {
   PEOPLE_STATE_FIELD_ID,
 } from "__support__/sample_dataset_fixture";
 
-import { drillDownForDimensions } from "../../../src/metabase/qb/lib/drilldown";
+import { drillDownForDimensions } from "metabase/qb/lib/drilldown";
 
 const col = (fieldId, extra = {}) => ({
   ...metadata.fields[fieldId],
diff --git a/frontend/test/nav/ProfileLink.unit.spec.js b/frontend/test/metabase/nav/ProfileLink.unit.spec.js
similarity index 100%
rename from frontend/test/nav/ProfileLink.unit.spec.js
rename to frontend/test/metabase/nav/ProfileLink.unit.spec.js
diff --git a/frontend/test/parameters/components/widgets/CategoryWidget.e2e.spec.js b/frontend/test/metabase/parameters/components/widgets/CategoryWidget.e2e.spec.js
similarity index 100%
rename from frontend/test/parameters/components/widgets/CategoryWidget.e2e.spec.js
rename to frontend/test/metabase/parameters/components/widgets/CategoryWidget.e2e.spec.js
diff --git a/frontend/test/parameters/components/widgets/DateRangeWidget.unit.spec.js b/frontend/test/metabase/parameters/components/widgets/DateRangeWidget.unit.spec.js
similarity index 100%
rename from frontend/test/parameters/components/widgets/DateRangeWidget.unit.spec.js
rename to frontend/test/metabase/parameters/components/widgets/DateRangeWidget.unit.spec.js
diff --git a/frontend/test/parameters/parameters.e2e.spec.js b/frontend/test/metabase/parameters/parameters.e2e.spec.js
similarity index 100%
rename from frontend/test/parameters/parameters.e2e.spec.js
rename to frontend/test/metabase/parameters/parameters.e2e.spec.js
diff --git a/frontend/test/public/public.e2e.spec.js b/frontend/test/metabase/public/public.e2e.spec.js
similarity index 100%
rename from frontend/test/public/public.e2e.spec.js
rename to frontend/test/metabase/public/public.e2e.spec.js
diff --git a/frontend/test/pulse/pulse.e2e.spec.js b/frontend/test/metabase/pulse/pulse.e2e.spec.js
similarity index 100%
rename from frontend/test/pulse/pulse.e2e.spec.js
rename to frontend/test/metabase/pulse/pulse.e2e.spec.js
diff --git a/frontend/test/pulse/pulse.unit.spec.js b/frontend/test/metabase/pulse/pulse.unit.spec.js
similarity index 100%
rename from frontend/test/pulse/pulse.unit.spec.js
rename to frontend/test/metabase/pulse/pulse.unit.spec.js
diff --git a/frontend/test/query_builder/actions.e2e.spec.js b/frontend/test/metabase/query_builder/actions.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/actions.e2e.spec.js
rename to frontend/test/metabase/query_builder/actions.e2e.spec.js
diff --git a/frontend/test/query_builder/components/ActionsWidget.e2e.spec.js b/frontend/test/metabase/query_builder/components/ActionsWidget.e2e.spec.js
similarity index 96%
rename from frontend/test/query_builder/components/ActionsWidget.e2e.spec.js
rename to frontend/test/metabase/query_builder/components/ActionsWidget.e2e.spec.js
index 5aae620f8686e5be7d42d7a760be609875651dde..578a88b3ba0ef4a5f832f4b10998328bc76450ad 100644
--- a/frontend/test/query_builder/components/ActionsWidget.e2e.spec.js
+++ b/frontend/test/metabase/query_builder/components/ActionsWidget.e2e.spec.js
@@ -7,7 +7,7 @@ import { click } from "__support__/enzyme_utils";
 import React from "react";
 import { mount, shallow } from "enzyme";
 
-import ActionsWidget from "../../../src/metabase/query_builder/components/ActionsWidget";
+import ActionsWidget from "metabase/query_builder/components/ActionsWidget";
 import Question from "metabase-lib/lib/Question";
 import {
   DATABASE_ID,
diff --git a/frontend/test/query_builder/components/FieldList.e2e.spec.js b/frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js
similarity index 97%
rename from frontend/test/query_builder/components/FieldList.e2e.spec.js
rename to frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js
index 008db86b934f35b595c8d8fc121f59b5e999a6e0..049627d67867d31490f1f0f057f05cbdf32f4c1d 100644
--- a/frontend/test/query_builder/components/FieldList.e2e.spec.js
+++ b/frontend/test/metabase/query_builder/components/FieldList.e2e.spec.js
@@ -11,7 +11,7 @@ import React from "react";
 import { Provider } from "react-redux";
 import { mount } from "enzyme";
 
-import FieldList from "../../../src/metabase/query_builder/components/FieldList";
+import FieldList from "metabase/query_builder/components/FieldList";
 import Question from "metabase-lib/lib/Question";
 import {
   DATABASE_ID,
diff --git a/frontend/test/query_builder/components/FieldName.unit.spec.js b/frontend/test/metabase/query_builder/components/FieldName.unit.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/FieldName.unit.spec.js
rename to frontend/test/metabase/query_builder/components/FieldName.unit.spec.js
diff --git a/frontend/test/query_builder/components/GuiQueryEditor.unit.spec.jsx b/frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.jsx
similarity index 95%
rename from frontend/test/query_builder/components/GuiQueryEditor.unit.spec.jsx
rename to frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.jsx
index 08038e4078f300ee851664ba8446a5353aa8de60..f1d8bba97ec52c86400ba01913818c3138a06c02 100644
--- a/frontend/test/query_builder/components/GuiQueryEditor.unit.spec.jsx
+++ b/frontend/test/metabase/query_builder/components/GuiQueryEditor.unit.spec.jsx
@@ -3,7 +3,7 @@ import { shallow } from "enzyme";
 
 import GuiQueryEditor, {
   BreakoutWidget,
-} from "../../../src/metabase/query_builder/components/GuiQueryEditor";
+} from "metabase/query_builder/components/GuiQueryEditor";
 import Question from "metabase-lib/lib/Question";
 import {
   DATABASE_ID,
diff --git a/frontend/test/query_builder/components/NativeQueryEditor.e2e.spec.jsx b/frontend/test/metabase/query_builder/components/NativeQueryEditor.e2e.spec.jsx
similarity index 100%
rename from frontend/test/query_builder/components/NativeQueryEditor.e2e.spec.jsx
rename to frontend/test/metabase/query_builder/components/NativeQueryEditor.e2e.spec.jsx
diff --git a/frontend/test/query_builder/components/VisualizationSettings.e2e.spec.js b/frontend/test/metabase/query_builder/components/VisualizationSettings.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/VisualizationSettings.e2e.spec.js
rename to frontend/test/metabase/query_builder/components/VisualizationSettings.e2e.spec.js
diff --git a/frontend/test/query_builder/components/dataref/FieldPane.e2e.spec.js b/frontend/test/metabase/query_builder/components/dataref/FieldPane.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/dataref/FieldPane.e2e.spec.js
rename to frontend/test/metabase/query_builder/components/dataref/FieldPane.e2e.spec.js
diff --git a/frontend/test/query_builder/components/dataref/MetricPane.e2e.spec.js b/frontend/test/metabase/query_builder/components/dataref/MetricPane.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/dataref/MetricPane.e2e.spec.js
rename to frontend/test/metabase/query_builder/components/dataref/MetricPane.e2e.spec.js
diff --git a/frontend/test/query_builder/components/dataref/SegmentPane.e2e.spec.js b/frontend/test/metabase/query_builder/components/dataref/SegmentPane.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/dataref/SegmentPane.e2e.spec.js
rename to frontend/test/metabase/query_builder/components/dataref/SegmentPane.e2e.spec.js
diff --git a/frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js b/frontend/test/metabase/query_builder/components/filters/FilterPopover.unit.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js
rename to frontend/test/metabase/query_builder/components/filters/FilterPopover.unit.spec.js
diff --git a/frontend/test/query_builder/components/filters/pickers/DatePicker.unit.spec.js b/frontend/test/metabase/query_builder/components/filters/pickers/DatePicker.unit.spec.js
similarity index 100%
rename from frontend/test/query_builder/components/filters/pickers/DatePicker.unit.spec.js
rename to frontend/test/metabase/query_builder/components/filters/pickers/DatePicker.unit.spec.js
diff --git a/frontend/test/query_builder/new_question.e2e.spec.js b/frontend/test/metabase/query_builder/new_question.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/new_question.e2e.spec.js
rename to frontend/test/metabase/query_builder/new_question.e2e.spec.js
diff --git a/frontend/test/query_builder/qb_drillthrough.e2e.spec.js b/frontend/test/metabase/query_builder/qb_drillthrough.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/qb_drillthrough.e2e.spec.js
rename to frontend/test/metabase/query_builder/qb_drillthrough.e2e.spec.js
diff --git a/frontend/test/query_builder/qb_editor_bar.e2e.spec.js b/frontend/test/metabase/query_builder/qb_editor_bar.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/qb_editor_bar.e2e.spec.js
rename to frontend/test/metabase/query_builder/qb_editor_bar.e2e.spec.js
diff --git a/frontend/test/query_builder/qb_question_states.e2e.spec.js b/frontend/test/metabase/query_builder/qb_question_states.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/qb_question_states.e2e.spec.js
rename to frontend/test/metabase/query_builder/qb_question_states.e2e.spec.js
diff --git a/frontend/test/query_builder/qb_remapping.js b/frontend/test/metabase/query_builder/qb_remapping.js
similarity index 100%
rename from frontend/test/query_builder/qb_remapping.js
rename to frontend/test/metabase/query_builder/qb_remapping.js
diff --git a/frontend/test/query_builder/qb_visualizations.e2e.spec.js b/frontend/test/metabase/query_builder/qb_visualizations.e2e.spec.js
similarity index 100%
rename from frontend/test/query_builder/qb_visualizations.e2e.spec.js
rename to frontend/test/metabase/query_builder/qb_visualizations.e2e.spec.js
diff --git a/frontend/test/redux/metadata.e2e.spec.js b/frontend/test/metabase/redux/metadata.e2e.spec.js
similarity index 100%
rename from frontend/test/redux/metadata.e2e.spec.js
rename to frontend/test/metabase/redux/metadata.e2e.spec.js
diff --git a/frontend/test/reference/databases.e2e.spec.js b/frontend/test/metabase/reference/databases.e2e.spec.js
similarity index 100%
rename from frontend/test/reference/databases.e2e.spec.js
rename to frontend/test/metabase/reference/databases.e2e.spec.js
diff --git a/frontend/test/reference/guide.e2e.spec.js b/frontend/test/metabase/reference/guide.e2e.spec.js
similarity index 100%
rename from frontend/test/reference/guide.e2e.spec.js
rename to frontend/test/metabase/reference/guide.e2e.spec.js
diff --git a/frontend/test/reference/metrics.e2e.spec.js b/frontend/test/metabase/reference/metrics.e2e.spec.js
similarity index 100%
rename from frontend/test/reference/metrics.e2e.spec.js
rename to frontend/test/metabase/reference/metrics.e2e.spec.js
diff --git a/frontend/test/reference/segments.e2e.spec.js b/frontend/test/metabase/reference/segments.e2e.spec.js
similarity index 100%
rename from frontend/test/reference/segments.e2e.spec.js
rename to frontend/test/metabase/reference/segments.e2e.spec.js
diff --git a/frontend/test/reference/utils.unit.spec.js b/frontend/test/metabase/reference/utils.unit.spec.js
similarity index 100%
rename from frontend/test/reference/utils.unit.spec.js
rename to frontend/test/metabase/reference/utils.unit.spec.js
diff --git a/frontend/test/selectors/metadata.e2e.spec.js b/frontend/test/metabase/selectors/metadata.e2e.spec.js
similarity index 100%
rename from frontend/test/selectors/metadata.e2e.spec.js
rename to frontend/test/metabase/selectors/metadata.e2e.spec.js
diff --git a/frontend/test/selectors/metadata.unit.spec.js b/frontend/test/metabase/selectors/metadata.unit.spec.js
similarity index 97%
rename from frontend/test/selectors/metadata.unit.spec.js
rename to frontend/test/metabase/selectors/metadata.unit.spec.js
index 174d2c142fd1fba7cbd3b8b5e61df9d501712229..f652f44d9f79c85ca0503de0ca8f913448bff8cf 100644
--- a/frontend/test/selectors/metadata.unit.spec.js
+++ b/frontend/test/metabase/selectors/metadata.unit.spec.js
@@ -9,7 +9,7 @@ import {
   ORDERS_CREATED_DATE_FIELD_ID,
 } from "__support__/sample_dataset_fixture";
 
-import { copyObjects } from "../../src/metabase/selectors/metadata";
+import { copyObjects } from "metabase/selectors/metadata";
 
 const NUM_TABLES = Object.keys(state.entities.tables).length;
 const NUM_DBS = Object.keys(state.entities.databases).length;
diff --git a/frontend/test/services/MetabaseApi.e2e.spec.js b/frontend/test/metabase/services/MetabaseApi.e2e.spec.js
similarity index 100%
rename from frontend/test/services/MetabaseApi.e2e.spec.js
rename to frontend/test/metabase/services/MetabaseApi.e2e.spec.js
diff --git a/frontend/test/services/__snapshots__/MetabaseApi.e2e.spec.js.snap b/frontend/test/metabase/services/__snapshots__/MetabaseApi.e2e.spec.js.snap
similarity index 100%
rename from frontend/test/services/__snapshots__/MetabaseApi.e2e.spec.js.snap
rename to frontend/test/metabase/services/__snapshots__/MetabaseApi.e2e.spec.js.snap
diff --git a/frontend/test/setup/signup.e2e.spec.js b/frontend/test/metabase/setup/signup.e2e.spec.js
similarity index 99%
rename from frontend/test/setup/signup.e2e.spec.js
rename to frontend/test/metabase/setup/signup.e2e.spec.js
index 73a4615cb94abfd06c5a2ed433ba4f8369796136..bfec7640c9479a28e9b50ec2fb7171331fad6e69 100644
--- a/frontend/test/setup/signup.e2e.spec.js
+++ b/frontend/test/metabase/setup/signup.e2e.spec.js
@@ -134,7 +134,7 @@ describe("setup wizard", () => {
     const nextButton = databaseStep.find('button[children="Next"]');
     expect(nextButton.props().disabled).toBe(true);
 
-    const dbPath = path.resolve(__dirname, "../__runner__/empty.db");
+    const dbPath = path.resolve(__dirname, "../../__runner__/empty.db");
     setInputValue(databaseStep.find("input[name='db']"), `file:${dbPath}`);
 
     expect(nextButton.props().disabled).toBe(undefined);
diff --git a/frontend/test/visualizations/__support__/visualizations.js b/frontend/test/metabase/visualizations/__support__/visualizations.js
similarity index 100%
rename from frontend/test/visualizations/__support__/visualizations.js
rename to frontend/test/metabase/visualizations/__support__/visualizations.js
diff --git a/frontend/test/visualizations/components/LegendVertical.unit.spec.js b/frontend/test/metabase/visualizations/components/LegendVertical.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/LegendVertical.unit.spec.js
rename to frontend/test/metabase/visualizations/components/LegendVertical.unit.spec.js
diff --git a/frontend/test/visualizations/components/LineAreaBarChart.unit.spec.js b/frontend/test/metabase/visualizations/components/LineAreaBarChart.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/LineAreaBarChart.unit.spec.js
rename to frontend/test/metabase/visualizations/components/LineAreaBarChart.unit.spec.js
diff --git a/frontend/test/visualizations/components/LineAreaBarRenderer-bar.unit.spec.js b/frontend/test/metabase/visualizations/components/LineAreaBarRenderer-bar.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/LineAreaBarRenderer-bar.unit.spec.js
rename to frontend/test/metabase/visualizations/components/LineAreaBarRenderer-bar.unit.spec.js
diff --git a/frontend/test/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js b/frontend/test/metabase/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js
rename to frontend/test/metabase/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js
diff --git a/frontend/test/visualizations/components/LineAreaBarRenderer.unit.spec.js b/frontend/test/metabase/visualizations/components/LineAreaBarRenderer.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/LineAreaBarRenderer.unit.spec.js
rename to frontend/test/metabase/visualizations/components/LineAreaBarRenderer.unit.spec.js
diff --git a/frontend/test/visualizations/components/ObjectDetail.e2e.spec.js b/frontend/test/metabase/visualizations/components/ObjectDetail.e2e.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/ObjectDetail.e2e.spec.js
rename to frontend/test/metabase/visualizations/components/ObjectDetail.e2e.spec.js
diff --git a/frontend/test/visualizations/components/ObjectDetail.unit.spec.js b/frontend/test/metabase/visualizations/components/ObjectDetail.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/ObjectDetail.unit.spec.js
rename to frontend/test/metabase/visualizations/components/ObjectDetail.unit.spec.js
diff --git a/frontend/test/visualizations/components/Visualization.e2e.spec.js b/frontend/test/metabase/visualizations/components/Visualization.e2e.spec.js
similarity index 100%
rename from frontend/test/visualizations/components/Visualization.e2e.spec.js
rename to frontend/test/metabase/visualizations/components/Visualization.e2e.spec.js
diff --git a/frontend/test/visualizations/components/settings/ChartSettingOrderedColumns.unit.spec.js b/frontend/test/metabase/visualizations/components/settings/ChartSettingOrderedColumns.unit.spec.js
similarity index 97%
rename from frontend/test/visualizations/components/settings/ChartSettingOrderedColumns.unit.spec.js
rename to frontend/test/metabase/visualizations/components/settings/ChartSettingOrderedColumns.unit.spec.js
index b2cb958d61e38712f372c140ea29cb4fe5c45c46..d7d089a790837c0264c99f7ee7f90031ceaa17f9 100644
--- a/frontend/test/visualizations/components/settings/ChartSettingOrderedColumns.unit.spec.js
+++ b/frontend/test/metabase/visualizations/components/settings/ChartSettingOrderedColumns.unit.spec.js
@@ -4,7 +4,7 @@ import ChartSettingOrderedColumns from "metabase/visualizations/components/setti
 
 import { mount } from "enzyme";
 
-import { question } from "../../../__support__/sample_dataset_fixture.js";
+import { question } from "__support__/sample_dataset_fixture.js";
 
 function renderChartSettingOrderedColumns(props) {
   return mount(
diff --git a/frontend/test/visualizations/drillthroughs.e2e.spec.js b/frontend/test/metabase/visualizations/drillthroughs.e2e.spec.js
similarity index 100%
rename from frontend/test/visualizations/drillthroughs.e2e.spec.js
rename to frontend/test/metabase/visualizations/drillthroughs.e2e.spec.js
diff --git a/frontend/test/visualizations/lib/errors.unit.spec.js b/frontend/test/metabase/visualizations/lib/errors.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/errors.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/errors.unit.spec.js
diff --git a/frontend/test/visualizations/lib/numeric.unit.spec.js b/frontend/test/metabase/visualizations/lib/numeric.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/numeric.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/numeric.unit.spec.js
diff --git a/frontend/test/visualizations/lib/settings.unit.spec.js b/frontend/test/metabase/visualizations/lib/settings.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/settings.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/settings.unit.spec.js
diff --git a/frontend/test/visualizations/lib/settings/nested.unit.spec.js b/frontend/test/metabase/visualizations/lib/settings/nested.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/settings/nested.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/settings/nested.unit.spec.js
diff --git a/frontend/test/visualizations/lib/settings/visualization.unit.spec.js b/frontend/test/metabase/visualizations/lib/settings/visualization.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/settings/visualization.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/settings/visualization.unit.spec.js
diff --git a/frontend/test/visualizations/lib/table.unit.spec.js b/frontend/test/metabase/visualizations/lib/table.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/table.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/table.unit.spec.js
diff --git a/frontend/test/visualizations/lib/timeseries.unit.spec.js b/frontend/test/metabase/visualizations/lib/timeseries.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/timeseries.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/timeseries.unit.spec.js
diff --git a/frontend/test/visualizations/lib/utils.unit.spec.js b/frontend/test/metabase/visualizations/lib/utils.unit.spec.js
similarity index 100%
rename from frontend/test/visualizations/lib/utils.unit.spec.js
rename to frontend/test/metabase/visualizations/lib/utils.unit.spec.js