diff --git a/src/actions/__tests__/about.test.ts b/src/actions/about.test.ts
similarity index 98%
rename from src/actions/__tests__/about.test.ts
rename to src/actions/about.test.ts
index a0b042519..282e80c37 100644
--- a/src/actions/__tests__/about.test.ts
+++ b/src/actions/about.test.ts
@@ -9,7 +9,7 @@ import {
   FETCH_ABOUT_PAGE_SUCCESS,
   FETCH_ABOUT_PAGE_FAIL,
   fetchAboutPage,
-} from '../about';
+} from './about';
 
 describe('fetchAboutPage()', () => {
   it('creates the expected actions on success', () => {
diff --git a/src/actions/__tests__/account-notes.test.ts b/src/actions/account-notes.test.ts
similarity index 96%
rename from src/actions/__tests__/account-notes.test.ts
rename to src/actions/account-notes.test.ts
index 53c1c85df..5cd45f26e 100644
--- a/src/actions/__tests__/account-notes.test.ts
+++ b/src/actions/account-notes.test.ts
@@ -1,7 +1,7 @@
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 
-import { submitAccountNote } from '../account-notes';
+import { submitAccountNote } from './account-notes';
 
 describe('submitAccountNote()', () => {
   let store: ReturnType<typeof mockStore>;
diff --git a/src/actions/__tests__/accounts.test.ts b/src/actions/accounts.test.ts
similarity index 99%
rename from src/actions/__tests__/accounts.test.ts
rename to src/actions/accounts.test.ts
index 9f264ab34..3d0c4deb8 100644
--- a/src/actions/__tests__/accounts.test.ts
+++ b/src/actions/accounts.test.ts
@@ -3,9 +3,9 @@ import { Map as ImmutableMap } from 'immutable';
 import { __stub } from 'soapbox/api';
 import { buildInstance, buildRelationship } from 'soapbox/jest/factory';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
+import { normalizeAccount } from 'soapbox/normalizers';
 import { ListRecord, ReducerRecord } from 'soapbox/reducers/user-lists';
 
-import { normalizeAccount } from '../../normalizers';
 import {
   authorizeFollowRequest,
   blockAccount,
@@ -25,7 +25,7 @@ import {
   unblockAccount,
   unmuteAccount,
   unsubscribeAccount,
-} from '../accounts';
+} from './accounts';
 
 let store: ReturnType<typeof mockStore>;
 
diff --git a/src/actions/__tests__/announcements.test.ts b/src/actions/announcements.test.ts
similarity index 100%
rename from src/actions/__tests__/announcements.test.ts
rename to src/actions/announcements.test.ts
diff --git a/src/actions/__tests__/blocks.test.ts b/src/actions/blocks.test.ts
similarity index 98%
rename from src/actions/__tests__/blocks.test.ts
rename to src/actions/blocks.test.ts
index 49f649ab6..bfa67c4be 100644
--- a/src/actions/__tests__/blocks.test.ts
+++ b/src/actions/blocks.test.ts
@@ -2,7 +2,7 @@ import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { ListRecord, ReducerRecord as UserListsRecord } from 'soapbox/reducers/user-lists';
 
-import { expandBlocks, fetchBlocks } from '../blocks';
+import { expandBlocks, fetchBlocks } from './blocks';
 
 const account = {
   acct: 'twoods',
diff --git a/src/actions/__tests__/compose.test.ts b/src/actions/compose.test.ts
similarity index 97%
rename from src/actions/__tests__/compose.test.ts
rename to src/actions/compose.test.ts
index 7026e3aab..c2141cbb0 100644
--- a/src/actions/__tests__/compose.test.ts
+++ b/src/actions/compose.test.ts
@@ -4,8 +4,8 @@ import { buildInstance } from 'soapbox/jest/factory';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { ReducerCompose } from 'soapbox/reducers/compose';
 
-import { uploadCompose, submitCompose } from '../compose';
-import { STATUS_CREATE_REQUEST } from '../statuses';
+import { uploadCompose, submitCompose } from './compose';
+import { STATUS_CREATE_REQUEST } from './statuses';
 
 import type { IntlShape } from 'react-intl';
 
diff --git a/src/actions/__tests__/me.test.ts b/src/actions/me.test.ts
similarity index 98%
rename from src/actions/__tests__/me.test.ts
rename to src/actions/me.test.ts
index 375eee761..63f22eac4 100644
--- a/src/actions/__tests__/me.test.ts
+++ b/src/actions/me.test.ts
@@ -5,7 +5,7 @@ import { buildAccount } from 'soapbox/jest/factory';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { AuthUserRecord, ReducerRecord } from 'soapbox/reducers/auth';
 
-import { fetchMe, patchMe } from '../me';
+import { fetchMe, patchMe } from './me';
 
 vi.mock('../../storage/kv-store', () => ({
   __esModule: true,
diff --git a/src/actions/__tests__/notifications.test.ts b/src/actions/notifications.test.ts
similarity index 94%
rename from src/actions/__tests__/notifications.test.ts
rename to src/actions/notifications.test.ts
index 5bc282add..0ead1491a 100644
--- a/src/actions/__tests__/notifications.test.ts
+++ b/src/actions/notifications.test.ts
@@ -4,7 +4,7 @@ import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { normalizeNotification } from 'soapbox/normalizers';
 
-import { markReadNotifications } from '../notifications';
+import { markReadNotifications } from './notifications';
 
 describe('markReadNotifications()', () => {
   it('fires off marker when top notification is newer than lastRead', async() => {
diff --git a/src/actions/__tests__/onboarding.test.ts b/src/actions/onboarding.test.ts
similarity index 99%
rename from src/actions/__tests__/onboarding.test.ts
rename to src/actions/onboarding.test.ts
index 15a10f93a..dc91f8a03 100644
--- a/src/actions/__tests__/onboarding.test.ts
+++ b/src/actions/onboarding.test.ts
@@ -1,6 +1,6 @@
 import { mockStore, mockWindowProperty, rootState } from 'soapbox/jest/test-helpers';
 
-import { checkOnboardingStatus, startOnboarding, endOnboarding } from '../onboarding';
+import { checkOnboardingStatus, startOnboarding, endOnboarding } from './onboarding';
 
 describe('checkOnboarding()', () => {
   let mockGetItem: any;
diff --git a/src/actions/__tests__/preload.test.ts b/src/actions/preload.test.ts
similarity index 89%
rename from src/actions/__tests__/preload.test.ts
rename to src/actions/preload.test.ts
index a15165164..029a8a833 100644
--- a/src/actions/__tests__/preload.test.ts
+++ b/src/actions/preload.test.ts
@@ -3,12 +3,12 @@ import { Map as ImmutableMap } from 'immutable';
 import { __stub } from 'soapbox/api';
 import { mockStore } from 'soapbox/jest/test-helpers';
 
-import { VERIFY_CREDENTIALS_REQUEST } from '../auth';
-import { ACCOUNTS_IMPORT } from '../importer';
+import { VERIFY_CREDENTIALS_REQUEST } from './auth';
+import { ACCOUNTS_IMPORT } from './importer';
 import {
   MASTODON_PRELOAD_IMPORT,
   preloadMastodon,
-} from '../preload';
+} from './preload';
 
 describe('preloadMastodon()', () => {
   it('creates the expected actions', () => {
diff --git a/src/actions/__tests__/rules.test.ts b/src/actions/rules.test.ts
similarity index 97%
rename from src/actions/__tests__/rules.test.ts
rename to src/actions/rules.test.ts
index 624e2dd0d..d25b54dbd 100644
--- a/src/actions/__tests__/rules.test.ts
+++ b/src/actions/rules.test.ts
@@ -1,7 +1,7 @@
 import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 
-import { fetchRules, RULES_FETCH_REQUEST, RULES_FETCH_SUCCESS } from '../rules';
+import { fetchRules, RULES_FETCH_REQUEST, RULES_FETCH_SUCCESS } from './rules';
 
 describe('fetchRules()', () => {
   it('sets the rules', async () => {
diff --git a/src/actions/__tests__/soapbox.test.ts b/src/actions/soapbox.test.ts
similarity index 95%
rename from src/actions/__tests__/soapbox.test.ts
rename to src/actions/soapbox.test.ts
index 6247ab256..1a698a36c 100644
--- a/src/actions/__tests__/soapbox.test.ts
+++ b/src/actions/soapbox.test.ts
@@ -1,7 +1,7 @@
 import { rootState } from 'soapbox/jest/test-helpers';
 import { RootState } from 'soapbox/store';
 
-import { getSoapboxConfig } from '../soapbox';
+import { getSoapboxConfig } from './soapbox';
 
 const ASCII_HEART = '❤'; // '\u2764\uFE0F'
 const RED_HEART_RGI = '❤️'; // '\u2764'
diff --git a/src/actions/__tests__/status-quotes.test.ts b/src/actions/status-quotes.test.ts
similarity index 98%
rename from src/actions/__tests__/status-quotes.test.ts
rename to src/actions/status-quotes.test.ts
index 1e68dc882..1e18904a3 100644
--- a/src/actions/__tests__/status-quotes.test.ts
+++ b/src/actions/status-quotes.test.ts
@@ -4,7 +4,7 @@ import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { StatusListRecord } from 'soapbox/reducers/status-lists';
 
-import { fetchStatusQuotes, expandStatusQuotes } from '../status-quotes';
+import { fetchStatusQuotes, expandStatusQuotes } from './status-quotes';
 
 const status = {
   account: {
diff --git a/src/actions/__tests__/statuses.test.ts b/src/actions/statuses.test.ts
similarity index 98%
rename from src/actions/__tests__/statuses.test.ts
rename to src/actions/statuses.test.ts
index 120d24807..8004a47ca 100644
--- a/src/actions/__tests__/statuses.test.ts
+++ b/src/actions/statuses.test.ts
@@ -5,7 +5,7 @@ import { __stub } from 'soapbox/api';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 import { normalizeStatus } from 'soapbox/normalizers/status';
 
-import { deleteStatus, fetchContext } from '../statuses';
+import { deleteStatus, fetchContext } from './statuses';
 
 describe('fetchContext()', () => {
   it('handles Mitra context', async () => {
diff --git a/src/api/hooks/groups/__tests__/useGroup.test.ts b/src/api/hooks/groups/useGroup.test.ts
similarity index 96%
rename from src/api/hooks/groups/__tests__/useGroup.test.ts
rename to src/api/hooks/groups/useGroup.test.ts
index 8afd06f1a..c6df44aab 100644
--- a/src/api/hooks/groups/__tests__/useGroup.test.ts
+++ b/src/api/hooks/groups/useGroup.test.ts
@@ -2,7 +2,7 @@ import { __stub } from 'soapbox/api';
 import { buildGroup } from 'soapbox/jest/factory';
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 
-import { useGroup } from '../useGroup';
+import { useGroup } from './useGroup';
 
 const group = buildGroup({ id: '1', display_name: 'soapbox' });
 
diff --git a/src/api/hooks/groups/__tests__/useGroupLookup.test.ts b/src/api/hooks/groups/useGroupLookup.test.ts
similarity index 96%
rename from src/api/hooks/groups/__tests__/useGroupLookup.test.ts
rename to src/api/hooks/groups/useGroupLookup.test.ts
index 6723aee78..ce3903ae3 100644
--- a/src/api/hooks/groups/__tests__/useGroupLookup.test.ts
+++ b/src/api/hooks/groups/useGroupLookup.test.ts
@@ -2,7 +2,7 @@ import { __stub } from 'soapbox/api';
 import { buildGroup } from 'soapbox/jest/factory';
 import { renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
 
-import { useGroupLookup } from '../useGroupLookup';
+import { useGroupLookup } from './useGroupLookup';
 
 const group = buildGroup({ id: '1', slug: 'soapbox' });
 const state = rootState.setIn(['instance', 'version'], '3.4.1 (compatible; TruthSocial 1.0.0)');
diff --git a/src/api/hooks/groups/__tests__/useGroupMedia.test.ts b/src/api/hooks/groups/useGroupMedia.test.ts
similarity index 96%
rename from src/api/hooks/groups/__tests__/useGroupMedia.test.ts
rename to src/api/hooks/groups/useGroupMedia.test.ts
index a68b79eb1..c38615c05 100644
--- a/src/api/hooks/groups/__tests__/useGroupMedia.test.ts
+++ b/src/api/hooks/groups/useGroupMedia.test.ts
@@ -2,7 +2,7 @@ import { __stub } from 'soapbox/api';
 import { buildStatus } from 'soapbox/jest/factory';
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 
-import { useGroupMedia } from '../useGroupMedia';
+import { useGroupMedia } from './useGroupMedia';
 
 const status = buildStatus();
 const groupId = '1';
diff --git a/src/api/hooks/groups/__tests__/useGroupMembers.test.ts b/src/api/hooks/groups/useGroupMembers.test.ts
similarity index 96%
rename from src/api/hooks/groups/__tests__/useGroupMembers.test.ts
rename to src/api/hooks/groups/useGroupMembers.test.ts
index 6f2fb6eac..d82133423 100644
--- a/src/api/hooks/groups/__tests__/useGroupMembers.test.ts
+++ b/src/api/hooks/groups/useGroupMembers.test.ts
@@ -3,7 +3,7 @@ import { buildGroupMember } from 'soapbox/jest/factory';
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import { useGroupMembers } from '../useGroupMembers';
+import { useGroupMembers } from './useGroupMembers';
 
 const groupMember = buildGroupMember();
 const groupId = '1';
diff --git a/src/api/hooks/groups/__tests__/useGroups.test.ts b/src/api/hooks/groups/useGroups.test.ts
similarity index 96%
rename from src/api/hooks/groups/__tests__/useGroups.test.ts
rename to src/api/hooks/groups/useGroups.test.ts
index 739a1c0af..950c4eb81 100644
--- a/src/api/hooks/groups/__tests__/useGroups.test.ts
+++ b/src/api/hooks/groups/useGroups.test.ts
@@ -3,7 +3,7 @@ import { buildGroup } from 'soapbox/jest/factory';
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import { useGroups } from '../useGroups';
+import { useGroups } from './useGroups';
 
 const group = buildGroup({ id: '1', display_name: 'soapbox' });
 const store = {
diff --git a/src/api/hooks/groups/__tests__/usePendingGroups.test.ts b/src/api/hooks/groups/usePendingGroups.test.ts
similarity index 96%
rename from src/api/hooks/groups/__tests__/usePendingGroups.test.ts
rename to src/api/hooks/groups/usePendingGroups.test.ts
index c5b85fe28..f2f76178c 100644
--- a/src/api/hooks/groups/__tests__/usePendingGroups.test.ts
+++ b/src/api/hooks/groups/usePendingGroups.test.ts
@@ -4,7 +4,7 @@ import { buildAccount, buildGroup } from 'soapbox/jest/factory';
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import { usePendingGroups } from '../usePendingGroups';
+import { usePendingGroups } from './usePendingGroups';
 
 const id = '1';
 const group = buildGroup({ id, display_name: 'soapbox' });
diff --git a/src/components/__tests__/account.test.tsx b/src/components/account.test.tsx
similarity index 94%
rename from src/components/__tests__/account.test.tsx
rename to src/components/account.test.tsx
index c231fc533..306ff21a8 100644
--- a/src/components/__tests__/account.test.tsx
+++ b/src/components/account.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
 import { buildAccount } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
 
-import { render, screen } from '../../jest/test-helpers';
-import Account from '../account';
+import Account from './account';
 
 describe('<Account />', () => {
   it('renders account name and username', () => {
diff --git a/src/components/__tests__/autosuggest-emoji.test.tsx b/src/components/autosuggest-emoji.test.tsx
similarity index 88%
rename from src/components/__tests__/autosuggest-emoji.test.tsx
rename to src/components/autosuggest-emoji.test.tsx
index e2f059ff7..38e45a370 100644
--- a/src/components/__tests__/autosuggest-emoji.test.tsx
+++ b/src/components/autosuggest-emoji.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../jest/test-helpers';
-import AutosuggestEmoji from '../autosuggest-emoji';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import AutosuggestEmoji from './autosuggest-emoji';
 
 describe('<AutosuggestEmoji />', () => {
   it('renders native emoji', () => {
diff --git a/src/components/__tests__/badge.test.tsx b/src/components/badge.test.tsx
similarity index 71%
rename from src/components/__tests__/badge.test.tsx
rename to src/components/badge.test.tsx
index 1de80285d..6204f7dcb 100644
--- a/src/components/__tests__/badge.test.tsx
+++ b/src/components/badge.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../jest/test-helpers';
-import Badge from '../badge';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import Badge from './badge';
 
 describe('<Badge />', () => {
   it('renders correctly', () => {
diff --git a/src/components/__tests__/display-name.test.tsx b/src/components/display-name.test.tsx
similarity index 77%
rename from src/components/__tests__/display-name.test.tsx
rename to src/components/display-name.test.tsx
index 59ba65f19..7c819f637 100644
--- a/src/components/__tests__/display-name.test.tsx
+++ b/src/components/display-name.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
 import { buildAccount } from 'soapbox/jest/factory';
+import { render, screen } from 'soapbox/jest/test-helpers';
 
-import { render, screen } from '../../jest/test-helpers';
-import DisplayName from '../display-name';
+import DisplayName from './display-name';
 
 describe('<DisplayName />', () => {
   it('renders display name + account name', () => {
diff --git a/src/components/polls/__tests__/poll-footer.test.tsx b/src/components/polls/poll-footer.test.tsx
similarity index 98%
rename from src/components/polls/__tests__/poll-footer.test.tsx
rename to src/components/polls/poll-footer.test.tsx
index a9e709399..0215d170a 100644
--- a/src/components/polls/__tests__/poll-footer.test.tsx
+++ b/src/components/polls/poll-footer.test.tsx
@@ -7,7 +7,7 @@ import { __stub } from 'soapbox/api';
 import { mockStore, render, screen, rootState } from 'soapbox/jest/test-helpers';
 import { type Poll } from 'soapbox/schemas';
 
-import PollFooter from '../poll-footer';
+import PollFooter from './poll-footer';
 
 let poll: Poll = {
   id: '1',
diff --git a/src/components/__tests__/quoted-status.test.tsx b/src/components/quoted-status.test.tsx
similarity index 78%
rename from src/components/__tests__/quoted-status.test.tsx
rename to src/components/quoted-status.test.tsx
index 05c906985..ca52fa126 100644
--- a/src/components/__tests__/quoted-status.test.tsx
+++ b/src/components/quoted-status.test.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
 
-import { render, screen, rootState } from '../../jest/test-helpers';
-import { normalizeStatus, normalizeAccount } from '../../normalizers';
-import QuotedStatus from '../quoted-status';
+import { render, screen, rootState } from 'soapbox/jest/test-helpers';
+import { normalizeStatus, normalizeAccount } from 'soapbox/normalizers';
+
+import QuotedStatus from './quoted-status';
 
 import type { ReducerStatus } from 'soapbox/reducers/statuses';
 
diff --git a/src/components/__tests__/scroll-top-button.test.tsx b/src/components/scroll-top-button.test.tsx
similarity index 90%
rename from src/components/__tests__/scroll-top-button.test.tsx
rename to src/components/scroll-top-button.test.tsx
index 76e6b7c1c..d016ade8f 100644
--- a/src/components/__tests__/scroll-top-button.test.tsx
+++ b/src/components/scroll-top-button.test.tsx
@@ -1,8 +1,9 @@
 import React from 'react';
 import { defineMessages } from 'react-intl';
 
-import { render, screen } from '../../jest/test-helpers';
-import ScrollTopButton from '../scroll-top-button';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import ScrollTopButton from './scroll-top-button';
 
 const messages = defineMessages({
   queue: { id: 'status_list.queue_label', defaultMessage: 'Click to see {count} new {count, plural, one {post} other {posts}}' },
diff --git a/src/components/__tests__/status.test.tsx b/src/components/status.test.tsx
similarity index 97%
rename from src/components/__tests__/status.test.tsx
rename to src/components/status.test.tsx
index d2ec39ca2..b1c2cdeab 100644
--- a/src/components/__tests__/status.test.tsx
+++ b/src/components/status.test.tsx
@@ -4,7 +4,7 @@ import { buildAccount } from 'soapbox/jest/factory';
 import { render, screen, rootState } from 'soapbox/jest/test-helpers';
 import { normalizeStatus } from 'soapbox/normalizers';
 
-import Status from '../status';
+import Status from './status';
 
 import type { ReducerStatus } from 'soapbox/reducers/statuses';
 
diff --git a/src/components/statuses/__tests__/sensitive-content-overlay.test.tsx b/src/components/statuses/sensitive-content-overlay.test.tsx
similarity index 96%
rename from src/components/statuses/__tests__/sensitive-content-overlay.test.tsx
rename to src/components/statuses/sensitive-content-overlay.test.tsx
index ad677856e..4f93ef58c 100644
--- a/src/components/statuses/__tests__/sensitive-content-overlay.test.tsx
+++ b/src/components/statuses/sensitive-content-overlay.test.tsx
@@ -1,11 +1,11 @@
 import { Map as ImmutableMap } from 'immutable';
 import React from 'react';
 
+import { fireEvent, render, rootState, screen } from 'soapbox/jest/test-helpers';
 import { normalizeStatus } from 'soapbox/normalizers';
 import { ReducerStatus } from 'soapbox/reducers/statuses';
 
-import { fireEvent, render, rootState, screen } from '../../../jest/test-helpers';
-import SensitiveContentOverlay from '../sensitive-content-overlay';
+import SensitiveContentOverlay from './sensitive-content-overlay';
 
 describe('<SensitiveContentOverlay />', () => {
   let status: ReducerStatus;
diff --git a/src/components/ui/avatar/__tests__/avatar.test.tsx b/src/components/ui/avatar/avatar.test.tsx
similarity index 80%
rename from src/components/ui/avatar/__tests__/avatar.test.tsx
rename to src/components/ui/avatar/avatar.test.tsx
index b46e5e029..6c958f0cb 100644
--- a/src/components/ui/avatar/__tests__/avatar.test.tsx
+++ b/src/components/ui/avatar/avatar.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import Avatar from '../avatar';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import Avatar from './avatar';
 
 const src = '/static/alice.jpg';
 
diff --git a/src/components/ui/button/__tests__/button.test.tsx b/src/components/ui/button/button.test.tsx
similarity index 95%
rename from src/components/ui/button/__tests__/button.test.tsx
rename to src/components/ui/button/button.test.tsx
index f9c59c68a..5554caf0e 100644
--- a/src/components/ui/button/__tests__/button.test.tsx
+++ b/src/components/ui/button/button.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { fireEvent, render, screen } from '../../../../jest/test-helpers';
-import Button from '../button';
+import { fireEvent, render, screen } from 'soapbox/jest/test-helpers';
+
+import Button from './button';
 
 describe('<Button />', () => {
   it('renders the given text', () => {
diff --git a/src/components/ui/card/__tests__/card.test.tsx b/src/components/ui/card/card.test.tsx
similarity index 86%
rename from src/components/ui/card/__tests__/card.test.tsx
rename to src/components/ui/card/card.test.tsx
index fb116ff89..aa540f6da 100644
--- a/src/components/ui/card/__tests__/card.test.tsx
+++ b/src/components/ui/card/card.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import { Card, CardBody, CardHeader, CardTitle } from '../card';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import { Card, CardBody, CardHeader, CardTitle } from './card';
 
 describe('<Card />', () => {
   it('renders the CardTitle and CardBody', () => {
diff --git a/src/components/ui/column/__tests__/column.test.tsx b/src/components/ui/column/column.test.tsx
similarity index 68%
rename from src/components/ui/column/__tests__/column.test.tsx
rename to src/components/ui/column/column.test.tsx
index f4796dfaf..bc40ca59d 100644
--- a/src/components/ui/column/__tests__/column.test.tsx
+++ b/src/components/ui/column/column.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import { Column } from '../column';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import { Column } from './column';
 
 describe('<Column />', () => {
   it('renders correctly with minimal props', () => {
diff --git a/src/components/ui/datepicker/__tests__/datepicker.test.tsx b/src/components/ui/datepicker/datepicker.test.tsx
similarity index 96%
rename from src/components/ui/datepicker/__tests__/datepicker.test.tsx
rename to src/components/ui/datepicker/datepicker.test.tsx
index fb6b1a2c7..bf856c236 100644
--- a/src/components/ui/datepicker/__tests__/datepicker.test.tsx
+++ b/src/components/ui/datepicker/datepicker.test.tsx
@@ -1,8 +1,9 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { queryAllByRole, render, screen } from '../../../../jest/test-helpers';
-import Datepicker from '../datepicker';
+import { queryAllByRole, render, screen } from 'soapbox/jest/test-helpers';
+
+import Datepicker from './datepicker';
 
 describe('<Datepicker />', () => {
   it('defaults to the current date', () => {
diff --git a/src/components/ui/divider/__tests__/divider.test.tsx b/src/components/ui/divider/divider.test.tsx
similarity index 79%
rename from src/components/ui/divider/__tests__/divider.test.tsx
rename to src/components/ui/divider/divider.test.tsx
index c0d244187..43a53eec8 100644
--- a/src/components/ui/divider/__tests__/divider.test.tsx
+++ b/src/components/ui/divider/divider.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import Divider from '../divider';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import Divider from './divider';
 
 describe('<Divider />', () => {
   it('renders without text', () => {
diff --git a/src/components/ui/emoji/__tests__/emoji.test.tsx b/src/components/ui/emoji/emoji.test.tsx
similarity index 86%
rename from src/components/ui/emoji/__tests__/emoji.test.tsx
rename to src/components/ui/emoji/emoji.test.tsx
index c87ef9040..c4bf686d8 100644
--- a/src/components/ui/emoji/__tests__/emoji.test.tsx
+++ b/src/components/ui/emoji/emoji.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import Emoji from '../emoji';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import Emoji from './emoji';
 
 describe('<Emoji />', () => {
   it('renders a simple emoji', () => {
diff --git a/src/components/ui/form-actions/__tests__/form-actions.test.tsx b/src/components/ui/form-actions/form-actions.test.tsx
similarity index 70%
rename from src/components/ui/form-actions/__tests__/form-actions.test.tsx
rename to src/components/ui/form-actions/form-actions.test.tsx
index 3c954ca69..53738853d 100644
--- a/src/components/ui/form-actions/__tests__/form-actions.test.tsx
+++ b/src/components/ui/form-actions/form-actions.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import FormActions from '../form-actions';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import FormActions from './form-actions';
 
 describe('<FormActions />', () => {
   it('renders successfully', () => {
diff --git a/src/components/ui/form-group/__tests__/form-group.test.tsx b/src/components/ui/form-group/form-group.test.tsx
similarity index 93%
rename from src/components/ui/form-group/__tests__/form-group.test.tsx
rename to src/components/ui/form-group/form-group.test.tsx
index a76200092..2b79c9c75 100644
--- a/src/components/ui/form-group/__tests__/form-group.test.tsx
+++ b/src/components/ui/form-group/form-group.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import FormGroup from '../form-group';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import FormGroup from './form-group';
 
 describe('<FormGroup />', () => {
   it('connects the label and input', () => {
diff --git a/src/components/ui/form/__tests__/form.test.tsx b/src/components/ui/form/form.test.tsx
similarity index 84%
rename from src/components/ui/form/__tests__/form.test.tsx
rename to src/components/ui/form/form.test.tsx
index 48ca61aa0..35fdddcf8 100644
--- a/src/components/ui/form/__tests__/form.test.tsx
+++ b/src/components/ui/form/form.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { fireEvent, render, screen } from '../../../../jest/test-helpers';
-import Form from '../form';
+import { fireEvent, render, screen } from 'soapbox/jest/test-helpers';
+
+import Form from './form';
 
 describe('<Form />', () => {
   it('renders children', () => {
diff --git a/src/components/ui/icon/__tests__/svg-icon.test.tsx b/src/components/ui/icon/svg-icon.test.tsx
similarity index 81%
rename from src/components/ui/icon/__tests__/svg-icon.test.tsx
rename to src/components/ui/icon/svg-icon.test.tsx
index 79cee2c65..b00380ddf 100644
--- a/src/components/ui/icon/__tests__/svg-icon.test.tsx
+++ b/src/components/ui/icon/svg-icon.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import SvgIcon from '../svg-icon';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import SvgIcon from './svg-icon';
 
 describe('<SvgIcon />', () => {
   it('renders loading element with default size', () => {
diff --git a/src/components/ui/modal/__tests__/modal.test.tsx b/src/components/ui/modal/modal.test.tsx
similarity index 97%
rename from src/components/ui/modal/__tests__/modal.test.tsx
rename to src/components/ui/modal/modal.test.tsx
index 9394d75cc..2941fe89a 100644
--- a/src/components/ui/modal/__tests__/modal.test.tsx
+++ b/src/components/ui/modal/modal.test.tsx
@@ -1,8 +1,9 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import Modal from '../modal';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import Modal from './modal';
 
 describe('<Modal />', () => {
   it('renders', () => {
diff --git a/src/components/__tests__/validation-checkmark.test.tsx b/src/components/validation-checkmark.test.tsx
similarity index 88%
rename from src/components/__tests__/validation-checkmark.test.tsx
rename to src/components/validation-checkmark.test.tsx
index c9e204a6e..fd0d4b765 100644
--- a/src/components/__tests__/validation-checkmark.test.tsx
+++ b/src/components/validation-checkmark.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../jest/test-helpers';
-import ValidationCheckmark from '../validation-checkmark';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import ValidationCheckmark from './validation-checkmark';
 
 describe('<ValidationCheckmark />', () => {
   it('renders text', () => {
diff --git a/src/entity-store/__tests__/reducer.test.ts b/src/entity-store/reducer.test.ts
similarity index 97%
rename from src/entity-store/__tests__/reducer.test.ts
rename to src/entity-store/reducer.test.ts
index 7c0d17962..36970463f 100644
--- a/src/entity-store/__tests__/reducer.test.ts
+++ b/src/entity-store/reducer.test.ts
@@ -6,11 +6,11 @@ import {
   entitiesFetchSuccess,
   importEntities,
   incrementEntities,
-} from '../actions';
-import reducer, { State } from '../reducer';
-import { createListState } from '../utils';
+} from './actions';
+import reducer, { State } from './reducer';
+import { createListState } from './utils';
 
-import type { EntityCache } from '../types';
+import type { EntityCache } from './types';
 
 interface TestEntity {
   id: string;
diff --git a/src/features/auth-login/components/__tests__/captcha.test.tsx b/src/features/auth-login/components/captcha.test.tsx
similarity index 85%
rename from src/features/auth-login/components/__tests__/captcha.test.tsx
rename to src/features/auth-login/components/captcha.test.tsx
index bb09d1dba..53cb7e7ae 100644
--- a/src/features/auth-login/components/__tests__/captcha.test.tsx
+++ b/src/features/auth-login/components/captcha.test.tsx
@@ -1,8 +1,9 @@
 import { Map as ImmutableMap } from 'immutable';
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import CaptchaField, { NativeCaptchaField } from '../captcha';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import CaptchaField, { NativeCaptchaField } from './captcha';
 
 describe('<CaptchaField />', () => {
   it('renders null by default', () => {
diff --git a/src/features/auth-login/components/__tests__/login-form.test.tsx b/src/features/auth-login/components/login-form.test.tsx
similarity index 90%
rename from src/features/auth-login/components/__tests__/login-form.test.tsx
rename to src/features/auth-login/components/login-form.test.tsx
index 85cff95a9..cb14335c2 100644
--- a/src/features/auth-login/components/__tests__/login-form.test.tsx
+++ b/src/features/auth-login/components/login-form.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { fireEvent, render, screen } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import { fireEvent, render, screen } from '../../../../jest/test-helpers';
-import LoginForm from '../login-form';
+import LoginForm from './login-form';
 
 describe('<LoginForm />', () => {
   it('renders for Pleroma', () => {
diff --git a/src/features/auth-login/components/__tests__/login-page.test.tsx b/src/features/auth-login/components/login-page.test.tsx
similarity index 93%
rename from src/features/auth-login/components/__tests__/login-page.test.tsx
rename to src/features/auth-login/components/login-page.test.tsx
index 987403bce..58538bebf 100644
--- a/src/features/auth-login/components/__tests__/login-page.test.tsx
+++ b/src/features/auth-login/components/login-page.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { render, screen } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import LoginPage from '../login-page';
+import LoginPage from './login-page';
 
 describe('<LoginPage />', () => {
   it('renders correctly on load', () => {
diff --git a/src/features/auth-login/components/__tests__/otp-auth-form.test.tsx b/src/features/auth-login/components/otp-auth-form.test.tsx
similarity index 72%
rename from src/features/auth-login/components/__tests__/otp-auth-form.test.tsx
rename to src/features/auth-login/components/otp-auth-form.test.tsx
index 3b1890102..432660643 100644
--- a/src/features/auth-login/components/__tests__/otp-auth-form.test.tsx
+++ b/src/features/auth-login/components/otp-auth-form.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import OtpAuthForm from '../otp-auth-form';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import OtpAuthForm from './otp-auth-form';
 
 describe('<OtpAuthForm />', () => {
   it('renders correctly', () => {
diff --git a/src/features/auth-login/components/__tests__/password-reset-confirm.test.tsx b/src/features/auth-login/components/password-reset-confirm.test.tsx
similarity index 91%
rename from src/features/auth-login/components/__tests__/password-reset-confirm.test.tsx
rename to src/features/auth-login/components/password-reset-confirm.test.tsx
index 0213d1a59..ab2372d08 100644
--- a/src/features/auth-login/components/__tests__/password-reset-confirm.test.tsx
+++ b/src/features/auth-login/components/password-reset-confirm.test.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
 import { __stub } from 'soapbox/api';
+import { fireEvent, render, screen, waitFor } from 'soapbox/jest/test-helpers';
 
-import { fireEvent, render, screen, waitFor } from '../../../../jest/test-helpers';
-import PasswordResetConfirm from '../password-reset-confirm';
+import PasswordResetConfirm from './password-reset-confirm';
 
 const TestableComponent = () => (
   <Switch>
diff --git a/src/features/chats/components/__tests__/chat-list-item.test.tsx b/src/features/chats/components/chat-list-item.test.tsx
similarity index 94%
rename from src/features/chats/components/__tests__/chat-list-item.test.tsx
rename to src/features/chats/components/chat-list-item.test.tsx
index bd410d0fb..cd6ad0421 100644
--- a/src/features/chats/components/__tests__/chat-list-item.test.tsx
+++ b/src/features/chats/components/chat-list-item.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
+import { render, screen } from 'soapbox/jest/test-helpers';
 import { IChat } from 'soapbox/queries/chats';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import ChatListItem from '../chat-list-item';
+import ChatListItem from './chat-list-item';
 
 const chat: any = {
   id: '1',
diff --git a/src/features/chats/components/__tests__/chat-message-list.test.tsx b/src/features/chats/components/chat-message-list.test.tsx
similarity index 95%
rename from src/features/chats/components/__tests__/chat-message-list.test.tsx
rename to src/features/chats/components/chat-message-list.test.tsx
index b73cc2352..23c522e81 100644
--- a/src/features/chats/components/__tests__/chat-message-list.test.tsx
+++ b/src/features/chats/components/chat-message-list.test.tsx
@@ -2,15 +2,15 @@ import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { VirtuosoMockContext } from 'react-virtuoso';
 
+import { __stub } from 'soapbox/api';
 import { ChatContext } from 'soapbox/contexts/chat-context';
 import { buildAccount, buildInstance } from 'soapbox/jest/factory';
+import { queryClient, render, rootState, screen, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeChatMessage } from 'soapbox/normalizers';
+import { IChat } from 'soapbox/queries/chats';
 import { ChatMessage } from 'soapbox/types/entities';
 
-import { __stub } from '../../../../api';
-import { queryClient, render, rootState, screen, waitFor } from '../../../../jest/test-helpers';
-import { IChat } from '../../../../queries/chats';
-import ChatMessageList from '../chat-message-list';
+import ChatMessageList from './chat-message-list';
 
 const chat: IChat = {
   accepted: true,
diff --git a/src/features/chats/components/__tests__/chat-message-reaction.test.tsx b/src/features/chats/components/chat-message-reaction.test.tsx
similarity index 93%
rename from src/features/chats/components/__tests__/chat-message-reaction.test.tsx
rename to src/features/chats/components/chat-message-reaction.test.tsx
index 0b3ce1887..88f102711 100644
--- a/src/features/chats/components/__tests__/chat-message-reaction.test.tsx
+++ b/src/features/chats/components/chat-message-reaction.test.tsx
@@ -1,8 +1,9 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import ChatMessageReaction from '../chat-message-reaction';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import ChatMessageReaction from './chat-message-reaction';
 
 const emojiReaction = ({
   name: '👍',
diff --git a/src/features/chats/components/chat-page/__tests__/chat-page.test.tsx b/src/features/chats/components/chat-page/__tests__/chat-page.test.tsx
deleted file mode 100644
index c3815512d..000000000
--- a/src/features/chats/components/chat-page/__tests__/chat-page.test.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-test.skip('skip', () => {});
-
-// import userEvent from '@testing-library/user-event';
-// import React from 'react';
-
-// import { __stub } from 'soapbox/api';
-// import { buildAccount } from 'soapbox/jest/factory';
-// import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
-
-// import ChatPage from '../chat-page';
-
-// describe('<ChatPage />', () => {
-//   let store: any;
-
-//   describe('before you finish onboarding', () => {
-//     it('renders the Welcome component', () => {
-//       render(<ChatPage />);
-
-//       expect(screen.getByTestId('chats-welcome')).toBeInTheDocument();
-//     });
-
-//     describe('when you complete onboarding', () => {
-//       const id = '1';
-
-//       beforeEach(() => {
-//         store = {
-//           me: id,
-//           accounts: {
-//             [id]: buildAccount({
-//               id,
-//               acct: 'justin-username',
-//               display_name: 'Justin L',
-//               avatar: 'test.jpg',
-//               source: {
-//                 chats_onboarded: false,
-//               },
-//             }),
-//           },
-//         };
-
-//         __stub((mock) => {
-//           mock
-//             .onPatch('/api/v1/accounts/update_credentials')
-//             .reply(200, { chats_onboarded: true, id });
-//         });
-//       });
-
-//       it('renders the Chats', async () => {
-//         render(<ChatPage />, undefined, store);
-//         await userEvent.click(screen.getByTestId('button'));
-
-//         expect(screen.getByTestId('chat-page')).toBeInTheDocument();
-
-//         await waitFor(() => {
-//           expect(screen.getByTestId('toast')).toHaveTextContent('Chat Settings updated successfully');
-//         });
-//       });
-//     });
-
-//     describe('when the API returns an error', () => {
-//       beforeEach(() => {
-//         store = {
-//           me: '1',
-//           accounts: {
-//             '1': buildAccount({
-//               id: '1',
-//               acct: 'justin-username',
-//               display_name: 'Justin L',
-//               avatar: 'test.jpg',
-//               source: {
-//                 chats_onboarded: false,
-//               },
-//             }),
-//           },
-//         };
-
-//         __stub((mock) => {
-//           mock
-//             .onPatch('/api/v1/accounts/update_credentials')
-//             .networkError();
-//         });
-//       });
-
-//       it('renders the Chats', async () => {
-//         render(<ChatPage />, undefined, store);
-//         await userEvent.click(screen.getByTestId('button'));
-
-//         await waitFor(() => {
-//           expect(screen.getByTestId('toast')).toHaveTextContent('Chat Settings failed to update.');
-//         });
-//       });
-//     });
-//   });
-// });
diff --git a/src/features/chats/components/__tests__/chat-pane-header.test.tsx b/src/features/chats/components/chat-pane-header.test.tsx
similarity index 95%
rename from src/features/chats/components/__tests__/chat-pane-header.test.tsx
rename to src/features/chats/components/chat-pane-header.test.tsx
index 06d1a1d97..6faac3fa8 100644
--- a/src/features/chats/components/__tests__/chat-pane-header.test.tsx
+++ b/src/features/chats/components/chat-pane-header.test.tsx
@@ -1,8 +1,9 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import ChatPaneHeader from '../chat-widget/chat-pane-header';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import ChatPaneHeader from './chat-widget/chat-pane-header';
 
 describe('<ChatPaneHeader />', () => {
   it('handles the onToggle prop', async () => {
diff --git a/src/features/chats/components/chat-pane/__tests__/chat-pane.test.tsx b/src/features/chats/components/chat-pane/chat-pane.test.tsx
similarity index 98%
rename from src/features/chats/components/chat-pane/__tests__/chat-pane.test.tsx
rename to src/features/chats/components/chat-pane/chat-pane.test.tsx
index 6e606f083..3997c242c 100644
--- a/src/features/chats/components/chat-pane/__tests__/chat-pane.test.tsx
+++ b/src/features/chats/components/chat-pane/chat-pane.test.tsx
@@ -7,7 +7,7 @@ import { StatProvider } from 'soapbox/contexts/stat-context';
 import chats from 'soapbox/jest/fixtures/chats.json';
 import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
 
-import ChatPane from '../chat-pane';
+import ChatPane from './chat-pane';
 
 const renderComponentWithChatContext = (store = {}) => render(
   <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
diff --git a/src/features/chats/components/chat-search/__tests__/chat-search.test.tsx b/src/features/chats/components/chat-search/chat-search.test.tsx
similarity index 93%
rename from src/features/chats/components/chat-search/__tests__/chat-search.test.tsx
rename to src/features/chats/components/chat-search/chat-search.test.tsx
index e7ea8d739..c2f1c8534 100644
--- a/src/features/chats/components/chat-search/__tests__/chat-search.test.tsx
+++ b/src/features/chats/components/chat-search/chat-search.test.tsx
@@ -4,9 +4,9 @@ import { VirtuosoMockContext } from 'react-virtuoso';
 
 import { __stub } from 'soapbox/api';
 import { ChatProvider } from 'soapbox/contexts/chat-context';
+import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
 
-import { render, screen, waitFor } from '../../../../../jest/test-helpers';
-import ChatSearch from '../chat-search';
+import ChatSearch from './chat-search';
 
 const renderComponent = () => render(
   <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
diff --git a/src/features/chats/components/__tests__/chat-widget.test.tsx b/src/features/chats/components/chat-widget.test.tsx
similarity index 95%
rename from src/features/chats/components/__tests__/chat-widget.test.tsx
rename to src/features/chats/components/chat-widget.test.tsx
index 7ed091d0f..a183be076 100644
--- a/src/features/chats/components/__tests__/chat-widget.test.tsx
+++ b/src/features/chats/components/chat-widget.test.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
 import { buildAccount } from 'soapbox/jest/factory';
+import { render, rootState } from 'soapbox/jest/test-helpers';
 
-import { render, rootState } from '../../../../jest/test-helpers';
-import ChatWidget from '../chat-widget/chat-widget';
+import ChatWidget from './chat-widget/chat-widget';
 
 const id = '1';
 const account = buildAccount({
diff --git a/src/features/compose/components/__tests__/search.test.tsx b/src/features/compose/components/__tests__/search.test.tsx
deleted file mode 100644
index 82bcca2db..000000000
--- a/src/features/compose/components/__tests__/search.test.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-test.skip('skip', () => {});
-
-// import userEvent from '@testing-library/user-event';
-// import React from 'react';
-
-// import { __stub } from 'soapbox/api';
-
-// import { render, screen, waitFor } from '../../../../jest/test-helpers';
-// import Search from '../search';
-
-// describe('<Search />', () => {
-//   it('successfully renders', async() => {
-//     render(<Search autosuggest />);
-//     expect(screen.getByLabelText('Search')).toBeInTheDocument();
-//   });
-
-//   it('handles onChange', async() => {
-//     __stub(mock => {
-//       mock.onGet('/api/v1/accounts/search').reply(200, [{ id: 1 }]);
-//     });
-//     const user = userEvent.setup();
-
-//     render(<Search autosuggest />);
-
-//     await user.type(screen.getByLabelText('Search'), '@jus');
-
-//     await waitFor(() => {
-//       expect(screen.getByLabelText('Search')).toHaveValue('@jus');
-//       expect(screen.getByTestId('account')).toBeInTheDocument();
-//     });
-//   });
-// });
diff --git a/src/features/compose/components/polls/__tests__/duration-selector.test.tsx b/src/features/compose/components/polls/duration-selector.test.tsx
similarity index 95%
rename from src/features/compose/components/polls/__tests__/duration-selector.test.tsx
rename to src/features/compose/components/polls/duration-selector.test.tsx
index 881015a1d..177d735b0 100644
--- a/src/features/compose/components/polls/__tests__/duration-selector.test.tsx
+++ b/src/features/compose/components/polls/duration-selector.test.tsx
@@ -1,8 +1,9 @@
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { render, screen } from '../../../../../jest/test-helpers';
-import DurationSelector from '../duration-selector';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import DurationSelector from './duration-selector';
 
 describe('<DurationSelector />', () => {
   it('defaults to 2 days', () => {
diff --git a/src/features/emoji/__tests__/emoji.test.ts b/src/features/emoji/index.test.ts
similarity index 99%
rename from src/features/emoji/__tests__/emoji.test.ts
rename to src/features/emoji/index.test.ts
index cd849d0f9..852181044 100644
--- a/src/features/emoji/__tests__/emoji.test.ts
+++ b/src/features/emoji/index.test.ts
@@ -1,4 +1,4 @@
-import emojify from '../index';
+import emojify from '.';
 
 describe('emoji', () => {
   describe('.emojify', () => {
diff --git a/src/features/emoji/__tests__/emoji-index.test.ts b/src/features/emoji/search.test.ts
similarity index 98%
rename from src/features/emoji/__tests__/emoji-index.test.ts
rename to src/features/emoji/search.test.ts
index 925e2627a..40c71df6c 100644
--- a/src/features/emoji/__tests__/emoji-index.test.ts
+++ b/src/features/emoji/search.test.ts
@@ -1,7 +1,7 @@
 import { List, Map } from 'immutable';
 import pick from 'lodash/pick';
 
-import search, { addCustomToPool } from '../search';
+import search, { addCustomToPool } from './search';
 
 const trimEmojis = (emoji: any) => pick(emoji, ['id', 'unified', 'native', 'custom']);
 
diff --git a/src/features/group/components/__tests__/group-action-button.test.tsx b/src/features/group/components/group-action-button.test.tsx
similarity index 98%
rename from src/features/group/components/__tests__/group-action-button.test.tsx
rename to src/features/group/components/group-action-button.test.tsx
index a0df6affe..adbaa658a 100644
--- a/src/features/group/components/__tests__/group-action-button.test.tsx
+++ b/src/features/group/components/group-action-button.test.tsx
@@ -5,7 +5,7 @@ import { render, screen } from 'soapbox/jest/test-helpers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import { Group } from 'soapbox/types/entities';
 
-import GroupActionButton from '../group-action-button';
+import GroupActionButton from './group-action-button';
 
 let group: Group;
 
diff --git a/src/features/group/components/__tests__/group-header.test.tsx b/src/features/group/components/group-header.test.tsx
similarity index 97%
rename from src/features/group/components/__tests__/group-header.test.tsx
rename to src/features/group/components/group-header.test.tsx
index 03f171e14..64e7fbb62 100644
--- a/src/features/group/components/__tests__/group-header.test.tsx
+++ b/src/features/group/components/group-header.test.tsx
@@ -4,7 +4,7 @@ import { buildGroup } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 import { Group } from 'soapbox/types/entities';
 
-import GroupHeader from '../group-header';
+import GroupHeader from './group-header';
 
 let group: Group;
 
diff --git a/src/features/group/components/__tests__/group-member-count.test.tsx b/src/features/group/components/group-member-count.test.tsx
similarity index 96%
rename from src/features/group/components/__tests__/group-member-count.test.tsx
rename to src/features/group/components/group-member-count.test.tsx
index c6e31f8a8..f9f3231b1 100644
--- a/src/features/group/components/__tests__/group-member-count.test.tsx
+++ b/src/features/group/components/group-member-count.test.tsx
@@ -4,7 +4,7 @@ import { buildGroup } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 import { Group } from 'soapbox/types/entities';
 
-import GroupMemberCount from '../group-member-count';
+import GroupMemberCount from './group-member-count';
 
 let group: Group;
 
diff --git a/src/features/group/components/__tests__/group-member-list-item.test.tsx b/src/features/group/components/group-member-list-item.test.tsx
similarity index 99%
rename from src/features/group/components/__tests__/group-member-list-item.test.tsx
rename to src/features/group/components/group-member-list-item.test.tsx
index abecc3287..e91901013 100644
--- a/src/features/group/components/__tests__/group-member-list-item.test.tsx
+++ b/src/features/group/components/group-member-list-item.test.tsx
@@ -6,7 +6,7 @@ import { buildGroup, buildGroupMember, buildGroupRelationship } from 'soapbox/je
 import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import GroupMemberListItem from '../group-member-list-item';
+import GroupMemberListItem from './group-member-list-item';
 
 describe('<GroupMemberListItem />', () => {
   describe('account rendering', () => {
diff --git a/src/features/group/components/__tests__/group-options-button.test.tsx b/src/features/group/components/group-options-button.test.tsx
similarity index 97%
rename from src/features/group/components/__tests__/group-options-button.test.tsx
rename to src/features/group/components/group-options-button.test.tsx
index 2745c885a..42ecb6504 100644
--- a/src/features/group/components/__tests__/group-options-button.test.tsx
+++ b/src/features/group/components/group-options-button.test.tsx
@@ -5,7 +5,7 @@ import { render, screen } from 'soapbox/jest/test-helpers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import { Group } from 'soapbox/types/entities';
 
-import GroupOptionsButton from '../group-options-button';
+import GroupOptionsButton from './group-options-button';
 
 let group: Group;
 
diff --git a/src/features/group/components/__tests__/group-privacy.test.tsx b/src/features/group/components/group-privacy.test.tsx
similarity index 95%
rename from src/features/group/components/__tests__/group-privacy.test.tsx
rename to src/features/group/components/group-privacy.test.tsx
index 3a2d4d9eb..9e8bc8bcf 100644
--- a/src/features/group/components/__tests__/group-privacy.test.tsx
+++ b/src/features/group/components/group-privacy.test.tsx
@@ -4,7 +4,7 @@ import { buildGroup } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 import { Group } from 'soapbox/types/entities';
 
-import GroupPrivacy from '../group-privacy';
+import GroupPrivacy from './group-privacy';
 
 let group: Group;
 
diff --git a/src/features/group/components/__tests__/group-relationship.test.tsx b/src/features/group/components/group-relationship.test.tsx
similarity index 96%
rename from src/features/group/components/__tests__/group-relationship.test.tsx
rename to src/features/group/components/group-relationship.test.tsx
index 4c6c10a48..9befcc928 100644
--- a/src/features/group/components/__tests__/group-relationship.test.tsx
+++ b/src/features/group/components/group-relationship.test.tsx
@@ -5,7 +5,7 @@ import { render, screen } from 'soapbox/jest/test-helpers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 import { Group } from 'soapbox/types/entities';
 
-import GroupRelationship from '../group-relationship';
+import GroupRelationship from './group-relationship';
 
 let group: Group;
 
diff --git a/src/features/group/components/__tests__/group-tag-list-item.test.tsx b/src/features/group/components/group-tag-list-item.test.tsx
similarity index 98%
rename from src/features/group/components/__tests__/group-tag-list-item.test.tsx
rename to src/features/group/components/group-tag-list-item.test.tsx
index f91853dc4..57c3cffbe 100644
--- a/src/features/group/components/__tests__/group-tag-list-item.test.tsx
+++ b/src/features/group/components/group-tag-list-item.test.tsx
@@ -4,7 +4,7 @@ import { buildGroup, buildGroupTag, buildGroupRelationship } from 'soapbox/jest/
 import { render, screen } from 'soapbox/jest/test-helpers';
 import { GroupRoles } from 'soapbox/schemas/group-member';
 
-import GroupTagListItem from '../group-tag-list-item';
+import GroupTagListItem from './group-tag-list-item';
 
 describe('<GroupTagListItem />', () => {
   describe('tag name', () => {
diff --git a/src/features/groups/__tests__/pending-requests.test.tsx b/src/features/groups/__tests__/pending-requests.test.tsx
deleted file mode 100644
index 9720d32d4..000000000
--- a/src/features/groups/__tests__/pending-requests.test.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-test.skip('skip', () => {});
-
-// import React from 'react';
-// import { VirtuosoMockContext } from 'react-virtuoso';
-
-// import { __stub } from 'soapbox/api';
-// import { buildAccount } from 'soapbox/jest/factory';
-// import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
-// import { normalizeGroup, normalizeGroupRelationship, normalizeInstance } from 'soapbox/normalizers';
-
-// import PendingRequests from '../pending-requests';
-
-// const userId = '1';
-// const store: any = {
-//   me: userId,
-//   accounts: {
-//     [userId]: buildAccount({
-//       id: userId,
-//       acct: 'justin-username',
-//       display_name: 'Justin L',
-//       avatar: 'test.jpg',
-//       source: {
-//         chats_onboarded: false,
-//       },
-//     }),
-//   },
-//   instance: normalizeInstance({
-//     version: '3.4.1 (compatible; TruthSocial 1.0.0)',
-//   }),
-// };
-
-// const renderApp = () => (
-//   render(
-//     <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
-//       <PendingRequests />
-//     </VirtuosoMockContext.Provider>,
-//     undefined,
-//     store,
-//   )
-// );
-
-// describe('<PendingRequests />', () => {
-//   describe('without pending group requests', () => {
-//     beforeEach(() => {
-//       __stub((mock) => {
-//         mock.onGet('/api/v1/groups?pending=true').reply(200, []);
-//       });
-//     });
-
-//     it('should render the blankslate', async () => {
-//       renderApp();
-
-//       await waitFor(() => {
-//         expect(screen.getByTestId('pending-requests-blankslate')).toBeInTheDocument();
-//         expect(screen.queryAllByTestId('group-card')).toHaveLength(0);
-//       });
-//     });
-//   });
-
-//   describe('with pending group requests', () => {
-//     beforeEach(() => {
-//       __stub((mock) => {
-//         mock.onGet('/api/v1/groups').reply(200, [
-//           normalizeGroup({
-//             display_name: 'Group',
-//             id: '1',
-//           }),
-//         ]);
-
-//         mock.onGet('/api/v1/groups/relationships?id[]=1').reply(200, [
-//           normalizeGroupRelationship({
-//             id: '1',
-//           }),
-//         ]);
-//       });
-//     });
-
-//     it('should render the groups', async () => {
-//       renderApp();
-
-//       await waitFor(() => {
-//         expect(screen.queryAllByTestId('group-card')).toHaveLength(1);
-//         expect(screen.queryAllByTestId('pending-requests-blankslate')).toHaveLength(0);
-//       });
-//     });
-//   });
-// });
\ No newline at end of file
diff --git a/src/features/groups/components/__tests__/pending-group-rows.test.tsx b/src/features/groups/components/__tests__/pending-group-rows.test.tsx
deleted file mode 100644
index 7947f8e65..000000000
--- a/src/features/groups/components/__tests__/pending-group-rows.test.tsx
+++ /dev/null
@@ -1,107 +0,0 @@
-test.skip('skip', () => {});
-
-// import React from 'react';
-// import { VirtuosoMockContext } from 'react-virtuoso';
-
-// import { __stub } from 'soapbox/api';
-// import { buildAccount } from 'soapbox/jest/factory';
-// import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
-// import { normalizeGroup, normalizeGroupRelationship, normalizeInstance } from 'soapbox/normalizers';
-
-// import PendingGroupsRow from '../pending-groups-row';
-
-// const userId = '1';
-// let store: any = {
-//   me: userId,
-//   accounts: {
-//     [userId]: buildAccount({
-//       id: userId,
-//       acct: 'justin-username',
-//       display_name: 'Justin L',
-//       avatar: 'test.jpg',
-//       source: {
-//         chats_onboarded: false,
-//       },
-//     }),
-//   },
-// };
-
-// const renderApp = (store: any) => (
-//   render(
-//     <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
-//       <PendingGroupsRow />
-//     </VirtuosoMockContext.Provider>,
-//     undefined,
-//     store,
-//   )
-// );
-
-// describe('<PendingGroupRows />', () => {
-//   describe('without the feature', () => {
-//     beforeEach(() => {
-//       store = {
-//         ...store,
-//         instance: normalizeInstance({
-//           version: '2.7.2 (compatible; Pleroma 2.3.0)',
-//         }),
-//       };
-//     });
-
-//     it('should not render', () => {
-//       renderApp(store);
-//       expect(screen.queryAllByTestId('pending-items-row')).toHaveLength(0);
-//     });
-//   });
-
-//   describe('with the feature', () => {
-//     beforeEach(() => {
-//       store = {
-//         ...store,
-//         instance: normalizeInstance({
-//           version: '3.4.1 (compatible; TruthSocial 1.0.0)',
-//           software: 'TRUTHSOCIAL',
-//         }),
-//       };
-//     });
-
-//     describe('without pending group requests', () => {
-//       beforeEach(() => {
-//         __stub((mock) => {
-//           mock.onGet('/api/v1/groups?pending=true').reply(200, []);
-//         });
-//       });
-
-//       it('should not render', () => {
-//         renderApp(store);
-//         expect(screen.queryAllByTestId('pending-items-row')).toHaveLength(0);
-//       });
-//     });
-
-//     describe('with pending group requests', () => {
-//       beforeEach(() => {
-//         __stub((mock) => {
-//           mock.onGet('/api/v1/groups').reply(200, [
-//             normalizeGroup({
-//               display_name: 'Group',
-//               id: '1',
-//             }),
-//           ]);
-
-//           mock.onGet('/api/v1/groups/relationships?id[]=1').reply(200, [
-//             normalizeGroupRelationship({
-//               id: '1',
-//             }),
-//           ]);
-//         });
-//       });
-
-//       it('should render the row', async () => {
-//         renderApp(store);
-
-//         await waitFor(() => {
-//           expect(screen.queryAllByTestId('pending-items-row')).toHaveLength(1);
-//         });
-//       });
-//     });
-//   });
-// });
\ No newline at end of file
diff --git a/src/features/groups/components/discover/__tests__/group-grid-item.test.tsx b/src/features/groups/components/discover/group-grid-item.test.tsx
similarity index 93%
rename from src/features/groups/components/discover/__tests__/group-grid-item.test.tsx
rename to src/features/groups/components/discover/group-grid-item.test.tsx
index 09be8da84..054335dbe 100644
--- a/src/features/groups/components/discover/__tests__/group-grid-item.test.tsx
+++ b/src/features/groups/components/discover/group-grid-item.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { buildGroup } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import GroupGridItem from '../group-grid-item';
+import GroupGridItem from './group-grid-item';
 
 describe('<GroupGridItem', () => {
   it('should render correctly', () => {
diff --git a/src/features/groups/components/discover/__tests__/group-list-item.test.tsx b/src/features/groups/components/discover/group-list-item.test.tsx
similarity index 93%
rename from src/features/groups/components/discover/__tests__/group-list-item.test.tsx
rename to src/features/groups/components/discover/group-list-item.test.tsx
index f78b9da43..5046389f8 100644
--- a/src/features/groups/components/discover/__tests__/group-list-item.test.tsx
+++ b/src/features/groups/components/discover/group-list-item.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { buildGroup } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import GroupListItem from '../group-list-item';
+import GroupListItem from './group-list-item';
 
 describe('<GroupListItem', () => {
   it('should render correctly', () => {
diff --git a/src/features/groups/components/discover/__tests__/layout-buttons.test.tsx b/src/features/groups/components/discover/layout-buttons.test.tsx
similarity index 95%
rename from src/features/groups/components/discover/__tests__/layout-buttons.test.tsx
rename to src/features/groups/components/discover/layout-buttons.test.tsx
index c183ca7bd..a372d8058 100644
--- a/src/features/groups/components/discover/__tests__/layout-buttons.test.tsx
+++ b/src/features/groups/components/discover/layout-buttons.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 
 import { render, screen, within } from 'soapbox/jest/test-helpers';
 
-import LayoutButtons, { GroupLayout } from '../layout-buttons';
+import LayoutButtons, { GroupLayout } from './layout-buttons';
 
 describe('<LayoutButtons', () => {
   describe('when LIST view', () => {
diff --git a/src/features/groups/components/discover/search/__tests__/recent-searches.test.tsx b/src/features/groups/components/discover/search/__tests__/recent-searches.test.tsx
deleted file mode 100644
index 3bf350112..000000000
--- a/src/features/groups/components/discover/search/__tests__/recent-searches.test.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-test.skip('skip', () => {});
-
-// import userEvent from '@testing-library/user-event';
-// import React from 'react';
-// import { VirtuosoMockContext } from 'react-virtuoso';
-
-// import { buildAccount } from 'soapbox/jest/factory';
-// import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
-// import { groupSearchHistory } from 'soapbox/settings';
-// import { clearRecentGroupSearches, saveGroupSearch } from 'soapbox/utils/groups';
-
-// import RecentSearches from '../recent-searches';
-
-// const userId = '1';
-// const store = {
-//   me: userId,
-//   accounts: {
-//     [userId]: buildAccount({
-//       id: userId,
-//       acct: 'justin-username',
-//       display_name: 'Justin L',
-//       avatar: 'test.jpg',
-//       source: {
-//         chats_onboarded: false,
-//       },
-//     }),
-//   },
-// };
-
-// const renderApp = (children: React.ReactNode) => (
-//   render(
-//     <VirtuosoMockContext.Provider value={{ viewportHeight: 300, itemHeight: 100 }}>
-//       {children}
-//     </VirtuosoMockContext.Provider>,
-//     undefined,
-//     store,
-//   )
-// );
-
-// describe('<RecentSearches />', () => {
-//   describe('with recent searches', () => {
-//     beforeEach(() => {
-//       saveGroupSearch(userId, 'foobar');
-//     });
-
-//     afterEach(() => {
-//       clearRecentGroupSearches(userId);
-//     });
-
-//     it('should render the recent searches', async () => {
-//       renderApp(<RecentSearches onSelect={vi.fn()} />);
-
-//       await waitFor(() => {
-//         expect(screen.getByTestId('recent-search')).toBeInTheDocument();
-//       });
-//     });
-
-//     it('should support clearing recent searches', async () => {
-//       renderApp(<RecentSearches onSelect={vi.fn()} />);
-
-//       expect(groupSearchHistory.get(userId)).toHaveLength(1);
-//       await userEvent.click(screen.getByTestId('clear-recent-searches'));
-//       expect(groupSearchHistory.get(userId)).toBeNull();
-//     });
-
-//     it('should support click events on the results', async () => {
-//       const handler = vi.fn();
-//       renderApp(<RecentSearches onSelect={handler} />);
-//       expect(handler.mock.calls.length).toEqual(0);
-//       await userEvent.click(screen.getByTestId('recent-search-result'));
-//       expect(handler.mock.calls.length).toEqual(1);
-//     });
-//   });
-
-//   describe('without recent searches', () => {
-//     it('should render the blankslate', async () => {
-//       renderApp(<RecentSearches onSelect={vi.fn()} />);
-
-//       expect(screen.getByTestId('recent-searches-blankslate')).toBeInTheDocument();
-//     });
-//   });
-// });
\ No newline at end of file
diff --git a/src/features/groups/components/discover/search/__tests__/blankslate.test.tsx b/src/features/groups/components/discover/search/blankslate.test.tsx
similarity index 95%
rename from src/features/groups/components/discover/search/__tests__/blankslate.test.tsx
rename to src/features/groups/components/discover/search/blankslate.test.tsx
index 6b1166477..4b63badf6 100644
--- a/src/features/groups/components/discover/search/__tests__/blankslate.test.tsx
+++ b/src/features/groups/components/discover/search/blankslate.test.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import Blankslate from '../blankslate';
+import Blankslate from './blankslate';
 
 
 describe('<Blankslate />', () => {
diff --git a/src/features/groups/components/discover/search/__tests__/results.test.tsx b/src/features/groups/components/discover/search/results.test.tsx
similarity index 98%
rename from src/features/groups/components/discover/search/__tests__/results.test.tsx
rename to src/features/groups/components/discover/search/results.test.tsx
index b53276bc3..1c3017c9b 100644
--- a/src/features/groups/components/discover/search/__tests__/results.test.tsx
+++ b/src/features/groups/components/discover/search/results.test.tsx
@@ -5,7 +5,7 @@ import { VirtuosoGridMockContext, VirtuosoMockContext } from 'react-virtuoso';
 import { buildAccount, buildGroup } from 'soapbox/jest/factory';
 import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
 
-import Results from '../results';
+import Results from './results';
 
 const userId = '1';
 const store = {
diff --git a/src/features/groups/components/discover/search/__tests__/search.test.tsx b/src/features/groups/components/discover/search/search.test.tsx
similarity index 98%
rename from src/features/groups/components/discover/search/__tests__/search.test.tsx
rename to src/features/groups/components/discover/search/search.test.tsx
index 4cf062227..f7dbafa3d 100644
--- a/src/features/groups/components/discover/search/__tests__/search.test.tsx
+++ b/src/features/groups/components/discover/search/search.test.tsx
@@ -5,7 +5,7 @@ import { buildGroup } from 'soapbox/jest/factory';
 import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import Search from '../search';
+import Search from './search';
 
 const store = {
   instance: normalizeInstance({
diff --git a/src/features/groups/components/discover/__tests__/tag-list-item.test.tsx b/src/features/groups/components/discover/tag-list-item.test.tsx
similarity index 91%
rename from src/features/groups/components/discover/__tests__/tag-list-item.test.tsx
rename to src/features/groups/components/discover/tag-list-item.test.tsx
index c180c9234..6d8485d99 100644
--- a/src/features/groups/components/discover/__tests__/tag-list-item.test.tsx
+++ b/src/features/groups/components/discover/tag-list-item.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { buildGroupTag } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import TagListItem from '../tag-list-item';
+import TagListItem from './tag-list-item';
 
 describe('<TagListItem', () => {
   it('should render correctly', () => {
diff --git a/src/features/groups/__tests__/discover.test.tsx b/src/features/groups/discover.test.tsx
similarity index 98%
rename from src/features/groups/__tests__/discover.test.tsx
rename to src/features/groups/discover.test.tsx
index dc5d62280..1f14f1022 100644
--- a/src/features/groups/__tests__/discover.test.tsx
+++ b/src/features/groups/discover.test.tsx
@@ -5,7 +5,7 @@ import { buildAccount } from 'soapbox/jest/factory';
 import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import Discover from '../discover';
+import Discover from './discover';
 
 vi.mock('../../../hooks/useDimensions', () => ({
   useDimensions: () => [{ scrollWidth: 190 }, null, { width: 300 }],
diff --git a/src/features/notifications/components/__tests__/notification.test.tsx b/src/features/notifications/components/notification.test.tsx
similarity index 99%
rename from src/features/notifications/components/__tests__/notification.test.tsx
rename to src/features/notifications/components/notification.test.tsx
index dfc811e08..31d43e23a 100644
--- a/src/features/notifications/components/__tests__/notification.test.tsx
+++ b/src/features/notifications/components/notification.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { updateNotifications } from 'soapbox/actions/notifications';
 import { render, screen, rootState, createTestStore } from 'soapbox/jest/test-helpers';
 
-import Notification from '../notification';
+import Notification from './notification';
 
 /** Prepare the notification for use by the component */
 const normalize = (notification: any) => {
diff --git a/src/features/ui/components/__tests__/compose-button.test.tsx b/src/features/ui/components/compose-button.test.tsx
similarity index 95%
rename from src/features/ui/components/__tests__/compose-button.test.tsx
rename to src/features/ui/components/compose-button.test.tsx
index ade56fae0..8e2b24b57 100644
--- a/src/features/ui/components/__tests__/compose-button.test.tsx
+++ b/src/features/ui/components/compose-button.test.tsx
@@ -7,7 +7,7 @@ import { MemoryRouter } from 'react-router-dom';
 import { MODAL_CLOSE, MODAL_OPEN } from 'soapbox/actions/modals';
 import { mockStore, rootState } from 'soapbox/jest/test-helpers';
 
-import ComposeButton from '../compose-button';
+import ComposeButton from './compose-button';
 
 const store = mockStore(rootState);
 const renderComposeButton = () => {
diff --git a/src/features/ui/components/__tests__/cta-banner.test.tsx b/src/features/ui/components/cta-banner.test.tsx
similarity index 87%
rename from src/features/ui/components/__tests__/cta-banner.test.tsx
rename to src/features/ui/components/cta-banner.test.tsx
index f35c76b48..3e8502027 100644
--- a/src/features/ui/components/__tests__/cta-banner.test.tsx
+++ b/src/features/ui/components/cta-banner.test.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
 import { storeClosed, storeLoggedIn, storeOpen } from 'soapbox/jest/mock-stores';
+import { render, screen } from 'soapbox/jest/test-helpers';
 
-import { render, screen } from '../../../../jest/test-helpers';
-import CtaBanner from '../cta-banner';
+import CtaBanner from './cta-banner';
 
 describe('<CtaBanner />', () => {
   it('renders the banner', () => {
diff --git a/src/features/ui/components/modals/__tests__/landing-page-modal.test.tsx b/src/features/ui/components/modals/landing-page-modal.test.tsx
similarity index 93%
rename from src/features/ui/components/modals/__tests__/landing-page-modal.test.tsx
rename to src/features/ui/components/modals/landing-page-modal.test.tsx
index bcd64224b..bb50a4c9b 100644
--- a/src/features/ui/components/modals/__tests__/landing-page-modal.test.tsx
+++ b/src/features/ui/components/modals/landing-page-modal.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { storeOpen } from 'soapbox/jest/mock-stores';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import LandingPageModal from '../landing-page-modal';
+import LandingPageModal from './landing-page-modal';
 
 describe('<LandingPageModal />', () => {
   it('successfully renders', () => {
diff --git a/src/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx b/src/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx
deleted file mode 100644
index f99b0e8bc..000000000
--- a/src/features/ui/components/modals/report-modal/__tests__/report-modal.test.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-test.skip('skip', () => {});
-
-// import userEvent from '@testing-library/user-event';
-// import { Map as ImmutableMap, Record as ImmutableRecord, Set as ImmutableSet } from 'immutable';
-// import React from 'react';
-
-// import { ReportableEntities } from 'soapbox/actions/reports';
-// import { __stub } from 'soapbox/api';
-// import { buildAccount } from 'soapbox/jest/factory';
-// import { render, screen, waitFor } from 'soapbox/jest/test-helpers';
-// import { normalizeStatus } from 'soapbox/normalizers';
-
-// import ReportModal from '../report-modal';
-
-// describe('<ReportModal />', () => {
-//   let store: any;
-
-//   beforeEach(() => {
-//     const rules = require('soapbox/__fixtures__/rules.json');
-//     const status = require('soapbox/__fixtures__/status-unordered-mentions.json');
-
-//     store = {
-//       accounts: {
-//         '1': buildAccount({
-//           id: '1',
-//           acct: 'username',
-//           display_name: 'My name',
-//           avatar: 'test.jpg',
-//         }),
-//       },
-//       reports: ImmutableRecord({
-//         new: ImmutableRecord({
-//           account_id: '1',
-//           status_ids: ImmutableSet(['1']),
-//           rule_ids: ImmutableSet(),
-//           entityType: ReportableEntities.STATUS,
-//         })(),
-//       })(),
-//       statuses: ImmutableMap({
-//         '1': normalizeStatus(status),
-//       }),
-//       rules: {
-//         items: rules,
-//       },
-//     };
-
-//     __stub(mock => {
-//       mock.onGet('/api/v1/instance/rules').reply(200, rules);
-//       mock.onPost('/api/v1/reports').reply(200, {});
-//     });
-//   });
-
-//   it('successfully renders the first step', () => {
-//     render(<ReportModal onClose={vi.fn} />, {}, store);
-//     expect(screen.getByText('Reason for reporting')).toBeInTheDocument();
-//   });
-
-//   it('successfully moves to the second step', async() => {
-//     const user = userEvent.setup();
-//     render(<ReportModal onClose={vi.fn} />, {}, store);
-//     await user.click(screen.getByTestId('rule-1'));
-//     await user.click(screen.getByText('Next'));
-//     expect(screen.getByText(/Further actions:/)).toBeInTheDocument();
-//   });
-
-//   it('successfully moves to the third step', async() => {
-//     const user = userEvent.setup();
-//     render(<ReportModal onClose={vi.fn} />, {}, store);
-//     await user.click(screen.getByTestId('rule-1'));
-//     await user.click(screen.getByText(/Next/));
-//     await user.click(screen.getByText(/Submit/));
-
-//     await waitFor(() => {
-//       expect(screen.getByText(/Thanks for submitting your report/)).toBeInTheDocument();
-//     });
-//   });
-// });
diff --git a/src/features/ui/components/modals/__tests__/unauthorized-modal.test.tsx b/src/features/ui/components/modals/unauthorized-modal.test.tsx
similarity index 93%
rename from src/features/ui/components/modals/__tests__/unauthorized-modal.test.tsx
rename to src/features/ui/components/modals/unauthorized-modal.test.tsx
index e94c0b9a7..d43c43f99 100644
--- a/src/features/ui/components/modals/__tests__/unauthorized-modal.test.tsx
+++ b/src/features/ui/components/modals/unauthorized-modal.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { storeOpen } from 'soapbox/jest/mock-stores';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import UnauthorizedModal from '../unauthorized-modal';
+import UnauthorizedModal from './unauthorized-modal';
 
 describe('<UnauthorizedModal />', () => {
   it('successfully renders', () => {
diff --git a/src/features/ui/components/__tests__/navbar.test.tsx b/src/features/ui/components/navbar.test.tsx
similarity index 95%
rename from src/features/ui/components/__tests__/navbar.test.tsx
rename to src/features/ui/components/navbar.test.tsx
index 5cf8eb6b4..aa9d32815 100644
--- a/src/features/ui/components/__tests__/navbar.test.tsx
+++ b/src/features/ui/components/navbar.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { storeOpen } from 'soapbox/jest/mock-stores';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import Navbar from '../navbar';
+import Navbar from './navbar';
 
 describe('<Navbar />', () => {
   it('successfully renders', () => {
diff --git a/src/features/ui/components/panels/__tests__/sign-up-panel.test.tsx b/src/features/ui/components/panels/sign-up-panel.test.tsx
similarity index 92%
rename from src/features/ui/components/panels/__tests__/sign-up-panel.test.tsx
rename to src/features/ui/components/panels/sign-up-panel.test.tsx
index 22a3fe00e..74a7f2bee 100644
--- a/src/features/ui/components/panels/__tests__/sign-up-panel.test.tsx
+++ b/src/features/ui/components/panels/sign-up-panel.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { storeOpen } from 'soapbox/jest/mock-stores';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import SignUpPanel from '../sign-up-panel';
+import SignUpPanel from './sign-up-panel';
 
 describe('<SignUpPanel />', () => {
   it('doesn\'t render by default', () => {
diff --git a/src/features/ui/components/__tests__/subscribe-button.test.tsx b/src/features/ui/components/subscribe-button.test.tsx
similarity index 92%
rename from src/features/ui/components/__tests__/subscribe-button.test.tsx
rename to src/features/ui/components/subscribe-button.test.tsx
index 7fff45278..2e67fe272 100644
--- a/src/features/ui/components/__tests__/subscribe-button.test.tsx
+++ b/src/features/ui/components/subscribe-button.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { buildAccount, buildRelationship } from 'soapbox/jest/factory';
 import { render, screen } from 'soapbox/jest/test-helpers';
 
-import SubscribeButton from '../subscription-button';
+import SubscribeButton from './subscription-button';
 
 const justin = {
   id: '1',
diff --git a/src/features/ui/components/__tests__/trends-panel.test.tsx b/src/features/ui/components/trends-panel.test.tsx
similarity index 97%
rename from src/features/ui/components/__tests__/trends-panel.test.tsx
rename to src/features/ui/components/trends-panel.test.tsx
index 4ec7a81b2..4ea1dca44 100644
--- a/src/features/ui/components/__tests__/trends-panel.test.tsx
+++ b/src/features/ui/components/trends-panel.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { __stub } from 'soapbox/api';
 import { queryClient, render, screen, waitFor } from 'soapbox/jest/test-helpers';
 
-import TrendsPanel from '../trends-panel';
+import TrendsPanel from './trends-panel';
 
 describe('<TrendsPanel />', () => {
   beforeEach(() => {
diff --git a/src/hooks/__tests__/useDimensions.test.ts b/src/hooks/useDimensions.test.ts
similarity index 91%
rename from src/hooks/__tests__/useDimensions.test.ts
rename to src/hooks/useDimensions.test.ts
index 4e97fdef3..14f8b2587 100644
--- a/src/hooks/__tests__/useDimensions.test.ts
+++ b/src/hooks/useDimensions.test.ts
@@ -1,7 +1,7 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 
-import { listener, mockDisconnect } from '../__mocks__/resize-observer';
-import { useDimensions } from '../useDimensions';
+import { listener, mockDisconnect } from './__mocks__/resize-observer';
+import { useDimensions } from './useDimensions';
 
 describe('useDimensions()', () => {
   beforeEach(() => {
diff --git a/src/hooks/__tests__/useGroupsPath.test.ts b/src/hooks/useGroupsPath.test.ts
similarity index 97%
rename from src/hooks/__tests__/useGroupsPath.test.ts
rename to src/hooks/useGroupsPath.test.ts
index 328639f5b..a7ba8979b 100644
--- a/src/hooks/__tests__/useGroupsPath.test.ts
+++ b/src/hooks/useGroupsPath.test.ts
@@ -3,7 +3,7 @@ import { buildAccount, buildGroup, buildGroupRelationship } from 'soapbox/jest/f
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 import { normalizeInstance } from 'soapbox/normalizers';
 
-import { useGroupsPath } from '../useGroupsPath';
+import { useGroupsPath } from './useGroupsPath';
 
 describe('useGroupsPath()', () => {
   test('without the groupsDiscovery feature', () => {
diff --git a/src/normalizers/__tests__/account.test.ts b/src/normalizers/account.test.ts
similarity index 99%
rename from src/normalizers/__tests__/account.test.ts
rename to src/normalizers/account.test.ts
index a51917866..219d2399c 100644
--- a/src/normalizers/__tests__/account.test.ts
+++ b/src/normalizers/account.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord, fromJS } from 'immutable';
 
-import { normalizeAccount } from '../account';
+import { normalizeAccount } from './account';
 
 const AVATAR_MISSING = require('soapbox/assets/images/avatar-missing.png');
 const HEADER_MISSING = require('soapbox/assets/images/header-missing.png');
diff --git a/src/normalizers/__tests__/attachment.test.ts b/src/normalizers/attachment.test.ts
similarity index 91%
rename from src/normalizers/__tests__/attachment.test.ts
rename to src/normalizers/attachment.test.ts
index 9647a55fa..f093b3243 100644
--- a/src/normalizers/__tests__/attachment.test.ts
+++ b/src/normalizers/attachment.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import { normalizeAttachment } from '../attachment';
+import { normalizeAttachment } from './attachment';
 
 describe('normalizeAttachment()', () => {
   it('adds base fields', () => {
diff --git a/src/normalizers/__tests__/chat-message.test.ts b/src/normalizers/chat-message.test.ts
similarity index 85%
rename from src/normalizers/__tests__/chat-message.test.ts
rename to src/normalizers/chat-message.test.ts
index 0ada7b8b3..83ab5c0ba 100644
--- a/src/normalizers/__tests__/chat-message.test.ts
+++ b/src/normalizers/chat-message.test.ts
@@ -1,7 +1,7 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import { normalizeAttachment } from '../attachment';
-import { normalizeChatMessage } from '../chat-message';
+import { normalizeAttachment } from './attachment';
+import { normalizeChatMessage } from './chat-message';
 
 describe('normalizeChatMessage()', () => {
   it('upgrades attachment to media_attachments', () => {
diff --git a/src/normalizers/__tests__/instance.test.ts b/src/normalizers/instance.test.ts
similarity index 99%
rename from src/normalizers/__tests__/instance.test.ts
rename to src/normalizers/instance.test.ts
index 3e950dcdc..1319aaf5d 100644
--- a/src/normalizers/__tests__/instance.test.ts
+++ b/src/normalizers/instance.test.ts
@@ -1,6 +1,6 @@
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
-import { normalizeInstance } from '../instance';
+import { normalizeInstance } from './instance';
 
 describe('normalizeInstance()', () => {
   it('normalizes an empty Map', () => {
diff --git a/src/normalizers/__tests__/mention.test.ts b/src/normalizers/mention.test.ts
similarity index 92%
rename from src/normalizers/__tests__/mention.test.ts
rename to src/normalizers/mention.test.ts
index 03d712175..90ffee65a 100644
--- a/src/normalizers/__tests__/mention.test.ts
+++ b/src/normalizers/mention.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import { normalizeMention } from '../mention';
+import { normalizeMention } from './mention';
 
 describe('normalizeMention()', () => {
   it('adds base fields', () => {
diff --git a/src/normalizers/__tests__/notification.test.ts b/src/normalizers/notification.test.ts
similarity index 89%
rename from src/normalizers/__tests__/notification.test.ts
rename to src/normalizers/notification.test.ts
index b72f0d9aa..bb28b3c58 100644
--- a/src/normalizers/__tests__/notification.test.ts
+++ b/src/normalizers/notification.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import { normalizeNotification } from '../notification';
+import { normalizeNotification } from './notification';
 
 describe('normalizeNotification()', () => {
   it('normalizes an empty map', () => {
diff --git a/src/normalizers/soapbox/__tests__/soapbox-config.test.ts b/src/normalizers/soapbox/soapbox-config.test.ts
similarity index 97%
rename from src/normalizers/soapbox/__tests__/soapbox-config.test.ts
rename to src/normalizers/soapbox/soapbox-config.test.ts
index 9142a3356..2b96d6678 100644
--- a/src/normalizers/soapbox/__tests__/soapbox-config.test.ts
+++ b/src/normalizers/soapbox/soapbox-config.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import { normalizeSoapboxConfig } from '../soapbox-config';
+import { normalizeSoapboxConfig } from './soapbox-config';
 
 describe('normalizeSoapboxConfig()', () => {
   it('adds base fields', () => {
diff --git a/src/normalizers/__tests__/status.test.ts b/src/normalizers/status.test.ts
similarity index 99%
rename from src/normalizers/__tests__/status.test.ts
rename to src/normalizers/status.test.ts
index 05dd29e6a..4ffd82f5d 100644
--- a/src/normalizers/__tests__/status.test.ts
+++ b/src/normalizers/status.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord, fromJS } from 'immutable';
 
-import { normalizeStatus } from '../status';
+import { normalizeStatus } from './status';
 
 import type { Poll, Card } from 'soapbox/types/entities';
 
diff --git a/src/queries/__tests__/chats.test.ts b/src/queries/chats.test.ts
similarity index 99%
rename from src/queries/__tests__/chats.test.ts
rename to src/queries/chats.test.ts
index 7bcffa90f..21a7ebd0d 100644
--- a/src/queries/__tests__/chats.test.ts
+++ b/src/queries/chats.test.ts
@@ -10,7 +10,7 @@ import { Store } from 'soapbox/store';
 import { ChatMessage } from 'soapbox/types/entities';
 import { flattenPages } from 'soapbox/utils/queries';
 
-import { ChatKeys, IChat, isLastMessage, useChat, useChatActions, useChatMessages, useChats } from '../chats';
+import { ChatKeys, IChat, isLastMessage, useChat, useChatActions, useChatMessages, useChats } from './chats';
 
 const chat: IChat = {
   accepted: true,
diff --git a/src/queries/__tests__/relationships.test.ts b/src/queries/relationships.test.ts
similarity index 98%
rename from src/queries/__tests__/relationships.test.ts
rename to src/queries/relationships.test.ts
index 02db36166..2c6e3ec8f 100644
--- a/src/queries/__tests__/relationships.test.ts
+++ b/src/queries/relationships.test.ts
@@ -5,7 +5,7 @@ import { buildRelationship } from 'soapbox/jest/factory';
 import { createTestStore, queryClient, renderHook, rootState, waitFor } from 'soapbox/jest/test-helpers';
 import { Store } from 'soapbox/store';
 
-import { useFetchRelationships } from '../relationships';
+import { useFetchRelationships } from './relationships';
 
 describe('useFetchRelationships()', () => {
   let store: Store;
diff --git a/src/queries/__tests__/suggestions.test.ts b/src/queries/suggestions.test.ts
similarity index 95%
rename from src/queries/__tests__/suggestions.test.ts
rename to src/queries/suggestions.test.ts
index cfd8cbb8a..4618cb6e7 100644
--- a/src/queries/__tests__/suggestions.test.ts
+++ b/src/queries/suggestions.test.ts
@@ -1,7 +1,7 @@
 import { __stub } from 'soapbox/api';
 import { renderHook, waitFor } from 'soapbox/jest/test-helpers';
 
-import { useOnboardingSuggestions } from '../suggestions';
+import { useOnboardingSuggestions } from './suggestions';
 
 describe('useOnboardingSuggestions', () => {
   describe('with a successful query', () => {
diff --git a/src/queries/__tests__/trends.test.ts b/src/queries/trends.test.ts
similarity index 97%
rename from src/queries/__tests__/trends.test.ts
rename to src/queries/trends.test.ts
index 784f928cb..36a590c07 100644
--- a/src/queries/__tests__/trends.test.ts
+++ b/src/queries/trends.test.ts
@@ -1,7 +1,7 @@
 import { __stub } from 'soapbox/api';
 import { queryClient, renderHook, waitFor } from 'soapbox/jest/test-helpers';
 
-import useTrends from '../trends';
+import useTrends from './trends';
 
 describe('useTrends', () => {
   beforeEach(() => {
diff --git a/src/reducers/__tests__/admin.test.ts b/src/reducers/admin.test.ts
similarity index 90%
rename from src/reducers/__tests__/admin.test.ts
rename to src/reducers/admin.test.ts
index a83e11022..fa4e26959 100644
--- a/src/reducers/__tests__/admin.test.ts
+++ b/src/reducers/admin.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import reducer from '../admin';
+import reducer from './admin';
 
 describe('admin reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/announcements.test.ts b/src/reducers/announcements.test.ts
similarity index 97%
rename from src/reducers/__tests__/announcements.test.ts
rename to src/reducers/announcements.test.ts
index 2051f75d8..f1299a816 100644
--- a/src/reducers/__tests__/announcements.test.ts
+++ b/src/reducers/announcements.test.ts
@@ -5,7 +5,7 @@ import {
   ANNOUNCEMENTS_UPDATE,
 } from 'soapbox/actions/announcements';
 
-import reducer from '../announcements';
+import reducer from './announcements';
 
 const announcements = require('soapbox/__fixtures__/announcements.json');
 
diff --git a/src/reducers/__tests__/auth.test.ts b/src/reducers/auth.test.ts
similarity index 99%
rename from src/reducers/__tests__/auth.test.ts
rename to src/reducers/auth.test.ts
index b6daa1614..927db942b 100644
--- a/src/reducers/__tests__/auth.test.ts
+++ b/src/reducers/auth.test.ts
@@ -12,7 +12,7 @@ import { ME_FETCH_SKIP } from 'soapbox/actions/me';
 import { MASTODON_PRELOAD_IMPORT } from 'soapbox/actions/preload';
 import { buildAccount } from 'soapbox/jest/factory';
 
-import reducer, { AuthAppRecord, AuthTokenRecord, AuthUserRecord, ReducerRecord } from '../auth';
+import reducer, { AuthAppRecord, AuthTokenRecord, AuthUserRecord, ReducerRecord } from './auth';
 
 describe('auth reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/compose.test.ts b/src/reducers/compose.test.ts
similarity index 99%
rename from src/reducers/__tests__/compose.test.ts
rename to src/reducers/compose.test.ts
index ccd87c573..456860f05 100644
--- a/src/reducers/__tests__/compose.test.ts
+++ b/src/reducers/compose.test.ts
@@ -7,7 +7,7 @@ import { TIMELINE_DELETE } from 'soapbox/actions/timelines';
 import { TagRecord } from 'soapbox/normalizers';
 import { normalizeStatus } from 'soapbox/normalizers/status';
 
-import reducer, { initialState, ReducerCompose } from '../compose';
+import reducer, { initialState, ReducerCompose } from './compose';
 
 describe('compose reducer', () => {
   it('returns the initial state by default', () => {
diff --git a/src/reducers/__tests__/contexts.test.ts b/src/reducers/contexts.test.ts
similarity index 98%
rename from src/reducers/__tests__/contexts.test.ts
rename to src/reducers/contexts.test.ts
index 29e9e3c07..0ca652784 100644
--- a/src/reducers/__tests__/contexts.test.ts
+++ b/src/reducers/contexts.test.ts
@@ -10,7 +10,7 @@ import { CONTEXT_FETCH_SUCCESS } from 'soapbox/actions/statuses';
 import { TIMELINE_DELETE } from 'soapbox/actions/timelines';
 import { applyActions } from 'soapbox/jest/test-helpers';
 
-import reducer, { ReducerRecord } from '../contexts';
+import reducer, { ReducerRecord } from './contexts';
 
 describe('contexts reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/conversations.test.ts b/src/reducers/conversations.test.ts
similarity index 97%
rename from src/reducers/__tests__/conversations.test.ts
rename to src/reducers/conversations.test.ts
index b92c6b931..1f2c09276 100644
--- a/src/reducers/__tests__/conversations.test.ts
+++ b/src/reducers/conversations.test.ts
@@ -2,7 +2,7 @@ import { List as ImmutableList, Record as ImmutableRecord } from 'immutable';
 
 import * as actions from 'soapbox/actions/conversations';
 
-import reducer from '../conversations';
+import reducer from './conversations';
 
 describe('conversations reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/custom-emojis.test.ts b/src/reducers/custom-emojis.test.ts
similarity index 84%
rename from src/reducers/__tests__/custom-emojis.test.ts
rename to src/reducers/custom-emojis.test.ts
index 294c9c0cf..f72df1bac 100644
--- a/src/reducers/__tests__/custom-emojis.test.ts
+++ b/src/reducers/custom-emojis.test.ts
@@ -1,6 +1,6 @@
 import { List as ImmutableList } from 'immutable';
 
-import reducer from '../custom-emojis';
+import reducer from './custom-emojis';
 
 describe('custom_emojis reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/domain-lists.test.ts b/src/reducers/domain-lists.test.ts
similarity index 85%
rename from src/reducers/__tests__/domain-lists.test.ts
rename to src/reducers/domain-lists.test.ts
index 7ba4d32f7..e990d2d32 100644
--- a/src/reducers/__tests__/domain-lists.test.ts
+++ b/src/reducers/domain-lists.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../domain-lists';
+import reducer from './domain-lists';
 
 describe('domain_lists reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/dropdown-menu.test.ts b/src/reducers/dropdown-menu.test.ts
similarity index 82%
rename from src/reducers/__tests__/dropdown-menu.test.ts
rename to src/reducers/dropdown-menu.test.ts
index ff279ea33..0706edf20 100644
--- a/src/reducers/__tests__/dropdown-menu.test.ts
+++ b/src/reducers/dropdown-menu.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../dropdown-menu';
+import reducer from './dropdown-menu';
 
 describe('dropdown_menu reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/filters.test.ts b/src/reducers/filters.test.ts
similarity index 86%
rename from src/reducers/__tests__/filters.test.ts
rename to src/reducers/filters.test.ts
index 5faa0f948..492eff94a 100644
--- a/src/reducers/__tests__/filters.test.ts
+++ b/src/reducers/filters.test.ts
@@ -1,6 +1,6 @@
 import { List as ImmutableList } from 'immutable';
 
-import reducer from '../filters';
+import reducer from './filters';
 
 describe('filters reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/index.test.ts b/src/reducers/index.test.ts
similarity index 92%
rename from src/reducers/__tests__/index.test.ts
rename to src/reducers/index.test.ts
index 2ef98847c..a3b1cf2ea 100644
--- a/src/reducers/__tests__/index.test.ts
+++ b/src/reducers/index.test.ts
@@ -1,6 +1,6 @@
 import { Record as ImmutableRecord } from 'immutable';
 
-import reducer from '..';
+import reducer from '.';
 
 describe('root reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/instance.test.ts b/src/reducers/instance.test.ts
similarity index 99%
rename from src/reducers/__tests__/instance.test.ts
rename to src/reducers/instance.test.ts
index 51903b1ef..93a06ee06 100644
--- a/src/reducers/__tests__/instance.test.ts
+++ b/src/reducers/instance.test.ts
@@ -1,7 +1,7 @@
 import { ADMIN_CONFIG_UPDATE_REQUEST } from 'soapbox/actions/admin';
 import { rememberInstance } from 'soapbox/actions/instance';
 
-import reducer from '../instance';
+import reducer from './instance';
 
 describe('instance reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/list-adder.test.ts b/src/reducers/list-adder.test.ts
similarity index 98%
rename from src/reducers/__tests__/list-adder.test.ts
rename to src/reducers/list-adder.test.ts
index f3ede138c..1c2153def 100644
--- a/src/reducers/__tests__/list-adder.test.ts
+++ b/src/reducers/list-adder.test.ts
@@ -2,7 +2,7 @@ import { List as ImmutableList, Record as ImmutableRecord } from 'immutable';
 
 import * as actions from 'soapbox/actions/lists';
 
-import reducer from '../list-adder';
+import reducer from './list-adder';
 
 describe('list_adder reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/lists.test.ts b/src/reducers/lists.test.ts
similarity index 86%
rename from src/reducers/__tests__/lists.test.ts
rename to src/reducers/lists.test.ts
index 43881a218..911d4f3a9 100644
--- a/src/reducers/__tests__/lists.test.ts
+++ b/src/reducers/lists.test.ts
@@ -1,6 +1,6 @@
 import { Map as ImmutableMap } from 'immutable';
 
-import reducer from '../lists';
+import reducer from './lists';
 
 describe('lists reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/me.test.ts b/src/reducers/me.test.ts
similarity index 83%
rename from src/reducers/__tests__/me.test.ts
rename to src/reducers/me.test.ts
index 28504ba54..753171d11 100644
--- a/src/reducers/__tests__/me.test.ts
+++ b/src/reducers/me.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../me';
+import reducer from './me';
 
 describe('me reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/meta.test.ts b/src/reducers/meta.test.ts
similarity index 95%
rename from src/reducers/__tests__/meta.test.ts
rename to src/reducers/meta.test.ts
index 272116391..eccf37ffc 100644
--- a/src/reducers/__tests__/meta.test.ts
+++ b/src/reducers/meta.test.ts
@@ -2,7 +2,7 @@ import { Record as ImmutableRecord } from 'immutable';
 
 import { SW_UPDATING, setSwUpdating } from 'soapbox/actions/sw';
 
-import reducer from '../meta';
+import reducer from './meta';
 
 describe('meta reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/modals.test.ts b/src/reducers/modals.test.ts
similarity index 97%
rename from src/reducers/__tests__/modals.test.ts
rename to src/reducers/modals.test.ts
index ce8390b91..e9e05427b 100644
--- a/src/reducers/__tests__/modals.test.ts
+++ b/src/reducers/modals.test.ts
@@ -2,7 +2,7 @@ import { List as ImmutableList, Record as ImmutableRecord } from 'immutable';
 
 import { MODAL_OPEN, MODAL_CLOSE } from 'soapbox/actions/modals';
 
-import reducer from '../modals';
+import reducer from './modals';
 
 describe('modal reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/mutes.test.ts b/src/reducers/mutes.test.ts
similarity index 97%
rename from src/reducers/__tests__/mutes.test.ts
rename to src/reducers/mutes.test.ts
index 27d38c002..988c3dcdf 100644
--- a/src/reducers/__tests__/mutes.test.ts
+++ b/src/reducers/mutes.test.ts
@@ -5,7 +5,7 @@ import {
   MUTES_TOGGLE_HIDE_NOTIFICATIONS,
 } from 'soapbox/actions/mutes';
 
-import reducer from '../mutes';
+import reducer from './mutes';
 
 describe('mutes reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/onboarding.test.ts b/src/reducers/onboarding.test.ts
similarity index 95%
rename from src/reducers/__tests__/onboarding.test.ts
rename to src/reducers/onboarding.test.ts
index 69b4b1b21..ad157a868 100644
--- a/src/reducers/__tests__/onboarding.test.ts
+++ b/src/reducers/onboarding.test.ts
@@ -1,6 +1,6 @@
 import { ONBOARDING_START, ONBOARDING_END } from 'soapbox/actions/onboarding';
 
-import reducer from '../onboarding';
+import reducer from './onboarding';
 
 describe('onboarding reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/polls.test.ts b/src/reducers/polls.test.ts
similarity index 96%
rename from src/reducers/__tests__/polls.test.ts
rename to src/reducers/polls.test.ts
index 74627fb68..4ff9a555a 100644
--- a/src/reducers/__tests__/polls.test.ts
+++ b/src/reducers/polls.test.ts
@@ -2,7 +2,7 @@ import { Map as ImmutableMap } from 'immutable';
 
 import { POLLS_IMPORT } from 'soapbox/actions/importer';
 
-import reducer from '../polls';
+import reducer from './polls';
 
 describe('polls reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/push-notifications.test.ts b/src/reducers/push-notifications.test.ts
similarity index 90%
rename from src/reducers/__tests__/push-notifications.test.ts
rename to src/reducers/push-notifications.test.ts
index 89778cf23..021cb1771 100644
--- a/src/reducers/__tests__/push-notifications.test.ts
+++ b/src/reducers/push-notifications.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../push-notifications';
+import reducer from './push-notifications';
 
 describe('push_notifications reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/relationships.test.ts b/src/reducers/relationships.test.ts
similarity index 91%
rename from src/reducers/__tests__/relationships.test.ts
rename to src/reducers/relationships.test.ts
index 62eb5376a..28b269ede 100644
--- a/src/reducers/__tests__/relationships.test.ts
+++ b/src/reducers/relationships.test.ts
@@ -1,11 +1,9 @@
 import { Map as ImmutableMap } from 'immutable';
 
 import lain from 'soapbox/__fixtures__/lain.json';
+import { ACCOUNT_IMPORT } from 'soapbox/actions/importer';
 
-import {
-  ACCOUNT_IMPORT,
-} from '../../actions/importer';
-import reducer from '../relationships';
+import reducer from './relationships';
 
 describe('relationships reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/reports.test.ts b/src/reducers/reports.test.ts
similarity index 92%
rename from src/reducers/__tests__/reports.test.ts
rename to src/reducers/reports.test.ts
index fd94e8062..8045bbc8a 100644
--- a/src/reducers/__tests__/reports.test.ts
+++ b/src/reducers/reports.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../reports';
+import reducer from './reports';
 
 describe('reports reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/rules.test.ts b/src/reducers/rules.test.ts
similarity index 96%
rename from src/reducers/__tests__/rules.test.ts
rename to src/reducers/rules.test.ts
index 25f8575ed..5c2d4b354 100644
--- a/src/reducers/__tests__/rules.test.ts
+++ b/src/reducers/rules.test.ts
@@ -1,7 +1,7 @@
 
 import { RULES_FETCH_REQUEST, RULES_FETCH_SUCCESS } from 'soapbox/actions/rules';
 
-import reducer from '../rules';
+import reducer from './rules';
 
 const initialState = {
   items: [],
diff --git a/src/reducers/__tests__/settings.test.ts b/src/reducers/settings.test.ts
similarity index 87%
rename from src/reducers/__tests__/settings.test.ts
rename to src/reducers/settings.test.ts
index 5b065fd4c..1623a9a96 100644
--- a/src/reducers/__tests__/settings.test.ts
+++ b/src/reducers/settings.test.ts
@@ -1,6 +1,6 @@
 import { Map as ImmutableMap } from 'immutable';
 
-import reducer from '../settings';
+import reducer from './settings';
 
 describe('settings reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/sidebar.test.ts b/src/reducers/sidebar.test.ts
similarity index 83%
rename from src/reducers/__tests__/sidebar.test.ts
rename to src/reducers/sidebar.test.ts
index 83212335f..b9bd1274a 100644
--- a/src/reducers/__tests__/sidebar.test.ts
+++ b/src/reducers/sidebar.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../sidebar';
+import reducer from './sidebar';
 
 describe('sidebar reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/soapbox.test.ts b/src/reducers/soapbox.test.ts
similarity index 97%
rename from src/reducers/__tests__/soapbox.test.ts
rename to src/reducers/soapbox.test.ts
index 20b67fb09..60e5ec5cc 100644
--- a/src/reducers/__tests__/soapbox.test.ts
+++ b/src/reducers/soapbox.test.ts
@@ -5,7 +5,7 @@ import soapbox from 'soapbox/__fixtures__/soapbox.json';
 import { ADMIN_CONFIG_UPDATE_SUCCESS } from 'soapbox/actions/admin';
 import * as actions from 'soapbox/actions/soapbox';
 
-import reducer from '../soapbox';
+import reducer from './soapbox';
 
 describe('soapbox reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/status-hover-card.test.tsx b/src/reducers/status-hover-card.test.tsx
similarity index 96%
rename from src/reducers/__tests__/status-hover-card.test.tsx
rename to src/reducers/status-hover-card.test.tsx
index 9983b5b14..5936ebcaa 100644
--- a/src/reducers/__tests__/status-hover-card.test.tsx
+++ b/src/reducers/status-hover-card.test.tsx
@@ -4,7 +4,7 @@ import {
   STATUS_HOVER_CARD_UPDATE,
 } from 'soapbox/actions/status-hover-card';
 
-import reducer, { ReducerRecord } from '../status-hover-card';
+import reducer, { ReducerRecord } from './status-hover-card';
 
 describe(STATUS_HOVER_CARD_OPEN, () => {
   it('sets the ref and statusId', () => {
diff --git a/src/reducers/__tests__/status-lists.test.ts b/src/reducers/status-lists.test.ts
similarity index 95%
rename from src/reducers/__tests__/status-lists.test.ts
rename to src/reducers/status-lists.test.ts
index e362b849e..e87c42e76 100644
--- a/src/reducers/__tests__/status-lists.test.ts
+++ b/src/reducers/status-lists.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../status-lists';
+import reducer from './status-lists';
 
 describe('status_lists reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/statuses.test.ts b/src/reducers/statuses.test.ts
similarity index 99%
rename from src/reducers/__tests__/statuses.test.ts
rename to src/reducers/statuses.test.ts
index 06d82c871..01923d134 100644
--- a/src/reducers/__tests__/statuses.test.ts
+++ b/src/reducers/statuses.test.ts
@@ -12,7 +12,7 @@ import {
 } from 'soapbox/actions/statuses';
 import { normalizeStatus } from 'soapbox/normalizers';
 
-import reducer, { ReducerStatus } from '../statuses';
+import reducer, { ReducerStatus } from './statuses';
 
 describe('statuses reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/suggestions.test.ts b/src/reducers/suggestions.test.ts
similarity index 96%
rename from src/reducers/__tests__/suggestions.test.ts
rename to src/reducers/suggestions.test.ts
index 156ae405b..a62067904 100644
--- a/src/reducers/__tests__/suggestions.test.ts
+++ b/src/reducers/suggestions.test.ts
@@ -1,6 +1,6 @@
 import { SUGGESTIONS_FETCH_SUCCESS, SUGGESTIONS_DISMISS } from 'soapbox/actions/suggestions';
 
-import reducer from '../suggestions';
+import reducer from './suggestions';
 
 describe('suggestions reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/timelines.test.ts b/src/reducers/timelines.test.ts
similarity index 98%
rename from src/reducers/__tests__/timelines.test.ts
rename to src/reducers/timelines.test.ts
index 2ce8a5b9b..697523e7c 100644
--- a/src/reducers/__tests__/timelines.test.ts
+++ b/src/reducers/timelines.test.ts
@@ -6,7 +6,7 @@ import {
   TIMELINE_EXPAND_SUCCESS,
 } from 'soapbox/actions/timelines';
 
-import reducer from '../timelines';
+import reducer from './timelines';
 
 describe('timelines reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/trends.test.ts b/src/reducers/trends.test.ts
similarity index 85%
rename from src/reducers/__tests__/trends.test.ts
rename to src/reducers/trends.test.ts
index 25330d770..79ee44ed3 100644
--- a/src/reducers/__tests__/trends.test.ts
+++ b/src/reducers/trends.test.ts
@@ -1,4 +1,4 @@
-import reducer from '../trends';
+import reducer from './trends';
 
 describe('trends reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/reducers/__tests__/user-lists.test.ts b/src/reducers/user-lists.test.ts
similarity index 95%
rename from src/reducers/__tests__/user-lists.test.ts
rename to src/reducers/user-lists.test.ts
index 396ca7239..a2477ada7 100644
--- a/src/reducers/__tests__/user-lists.test.ts
+++ b/src/reducers/user-lists.test.ts
@@ -1,6 +1,6 @@
 import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 
-import reducer from '../user-lists';
+import reducer from './user-lists';
 
 describe('user_lists reducer', () => {
   it('should return the initial state', () => {
diff --git a/src/schemas/__tests__/card.test.ts b/src/schemas/card.test.ts
similarity index 86%
rename from src/schemas/__tests__/card.test.ts
rename to src/schemas/card.test.ts
index d66730c21..f9b672c28 100644
--- a/src/schemas/__tests__/card.test.ts
+++ b/src/schemas/card.test.ts
@@ -1,4 +1,4 @@
-import { cardSchema } from '../card';
+import { cardSchema } from './card';
 
 describe('cardSchema', () => {
   it('adds base fields', () => {
diff --git a/src/schemas/__tests__/group.test.ts b/src/schemas/group.test.ts
similarity index 85%
rename from src/schemas/__tests__/group.test.ts
rename to src/schemas/group.test.ts
index 9cdfb66d9..5e37acfd2 100644
--- a/src/schemas/__tests__/group.test.ts
+++ b/src/schemas/group.test.ts
@@ -1,4 +1,4 @@
-import { groupSchema } from '../group';
+import { groupSchema } from './group';
 
 test('groupSchema with a TruthSocial group', () => {
   const data = require('soapbox/__fixtures__/group-truthsocial.json');
diff --git a/src/schemas/__tests__/poll.test.ts b/src/schemas/poll.test.ts
similarity index 96%
rename from src/schemas/__tests__/poll.test.ts
rename to src/schemas/poll.test.ts
index fe39315dd..ceff672aa 100644
--- a/src/schemas/__tests__/poll.test.ts
+++ b/src/schemas/poll.test.ts
@@ -1,4 +1,4 @@
-import { pollSchema } from '../poll';
+import { pollSchema } from './poll';
 
 describe('normalizePoll()', () => {
   it('adds base fields', () => {
diff --git a/src/__tests__/toast.test.tsx b/src/toast.test.tsx
similarity index 97%
rename from src/__tests__/toast.test.tsx
rename to src/toast.test.tsx
index bdeff2249..49f27850a 100644
--- a/src/__tests__/toast.test.tsx
+++ b/src/toast.test.tsx
@@ -1,14 +1,14 @@
 import { render } from '@testing-library/react';
 import { AxiosError, AxiosHeaders } from 'axios';
 import React from 'react';
+import { Toaster } from 'react-hot-toast';
 import { IntlProvider } from 'react-intl';
 
 import { act, screen } from 'soapbox/jest/test-helpers';
 
-function renderApp() {
-  const { Toaster } = require('react-hot-toast');
-  const toast = require('../toast').default;
+import toast from './toast';
 
+function renderApp() {
   return {
     toast,
     ...render(
diff --git a/src/utils/__tests__/accounts.test.ts b/src/utils/accounts.test.ts
similarity index 94%
rename from src/utils/__tests__/accounts.test.ts
rename to src/utils/accounts.test.ts
index 878d278dd..f884729f3 100644
--- a/src/utils/__tests__/accounts.test.ts
+++ b/src/utils/accounts.test.ts
@@ -2,7 +2,7 @@ import { AccountRecord } from 'soapbox/normalizers';
 
 import {
   getDomain,
-} from '../accounts';
+} from './accounts';
 
 import type { ReducerAccount } from 'soapbox/reducers/accounts';
 
diff --git a/src/utils/__tests__/badges.test.ts b/src/utils/badges.test.ts
similarity index 97%
rename from src/utils/__tests__/badges.test.ts
rename to src/utils/badges.test.ts
index fdddeea9f..e2e7e78d3 100644
--- a/src/utils/__tests__/badges.test.ts
+++ b/src/utils/badges.test.ts
@@ -6,7 +6,7 @@ import {
   filterBadges,
   getTagDiff,
   getBadges,
-} from '../badges';
+} from './badges';
 
 test('tagToBadge', () => {
   expect(tagToBadge('yolo')).toEqual('badge:yolo');
diff --git a/src/utils/__tests__/base64.test.ts b/src/utils/base64.test.ts
similarity index 85%
rename from src/utils/__tests__/base64.test.ts
rename to src/utils/base64.test.ts
index 1b3260faa..ae0782677 100644
--- a/src/utils/__tests__/base64.test.ts
+++ b/src/utils/base64.test.ts
@@ -1,4 +1,4 @@
-import * as base64 from '../base64';
+import * as base64 from './base64';
 
 describe('base64', () => {
   describe('decode', () => {
diff --git a/src/utils/__tests__/chats.test.ts b/src/utils/chats.test.ts
similarity index 97%
rename from src/utils/__tests__/chats.test.ts
rename to src/utils/chats.test.ts
index b98fb47f6..c7eb306c3 100644
--- a/src/utils/__tests__/chats.test.ts
+++ b/src/utils/chats.test.ts
@@ -3,7 +3,7 @@ import { normalizeChatMessage } from 'soapbox/normalizers';
 import { ChatKeys, IChat } from 'soapbox/queries/chats';
 import { queryClient } from 'soapbox/queries/client';
 
-import { updateChatMessage } from '../chats';
+import { updateChatMessage } from './chats';
 
 const chat: IChat = {
   accepted: true,
diff --git a/src/utils/__tests__/colors.test.ts b/src/utils/colors.test.ts
similarity index 92%
rename from src/utils/__tests__/colors.test.ts
rename to src/utils/colors.test.ts
index cb523e357..787d5886e 100644
--- a/src/utils/__tests__/colors.test.ts
+++ b/src/utils/colors.test.ts
@@ -1,4 +1,4 @@
-import tintify from '../colors';
+import tintify from './colors';
 
 const AZURE = '#0482d8';
 
diff --git a/src/utils/__tests__/comparators.test.ts b/src/utils/comparators.test.ts
similarity index 77%
rename from src/utils/__tests__/comparators.test.ts
rename to src/utils/comparators.test.ts
index f1cf72634..c84e6982c 100644
--- a/src/utils/__tests__/comparators.test.ts
+++ b/src/utils/comparators.test.ts
@@ -1,4 +1,4 @@
-import { compareId } from '../comparators';
+import { compareId } from './comparators';
 
 test('compareId', () => {
   expect(compareId('3', '3')).toBe(0);
diff --git a/src/utils/__tests__/config-db.test.ts b/src/utils/config-db.test.ts
similarity index 90%
rename from src/utils/__tests__/config-db.test.ts
rename to src/utils/config-db.test.ts
index 8f398ee9a..db6a423cf 100644
--- a/src/utils/__tests__/config-db.test.ts
+++ b/src/utils/config-db.test.ts
@@ -2,7 +2,7 @@ import { List as ImmutableList, fromJS } from 'immutable';
 
 import config_db from 'soapbox/__fixtures__/config_db.json';
 
-import { ConfigDB } from '../config-db';
+import { ConfigDB } from './config-db';
 
 test('find', () => {
   const configs = fromJS(config_db).get('configs');
diff --git a/src/utils/__tests__/emoji-reacts.test.ts b/src/utils/emoji-reacts.test.ts
similarity index 99%
rename from src/utils/__tests__/emoji-reacts.test.ts
rename to src/utils/emoji-reacts.test.ts
index 5d64fdf3d..38660fa13 100644
--- a/src/utils/__tests__/emoji-reacts.test.ts
+++ b/src/utils/emoji-reacts.test.ts
@@ -10,7 +10,7 @@ import {
   getReactForStatus,
   simulateEmojiReact,
   simulateUnEmojiReact,
-} from '../emoji-reacts';
+} from './emoji-reacts';
 
 const ALLOWED_EMOJI = ImmutableList([
   '👍',
diff --git a/src/utils/__tests__/emoji.test.ts b/src/utils/emoji.test.ts
similarity index 98%
rename from src/utils/__tests__/emoji.test.ts
rename to src/utils/emoji.test.ts
index ab1a4ddaa..9880589c2 100644
--- a/src/utils/__tests__/emoji.test.ts
+++ b/src/utils/emoji.test.ts
@@ -1,7 +1,7 @@
 import {
   removeVS16s,
   toCodePoints,
-} from '../emoji';
+} from './emoji';
 
 const ASCII_HEART = '❤'; // '\u2764\uFE0F'
 const RED_HEART_RGI = '❤️'; // '\u2764'
diff --git a/src/utils/__tests__/features.test.ts b/src/utils/features.test.ts
similarity index 99%
rename from src/utils/__tests__/features.test.ts
rename to src/utils/features.test.ts
index 090d05475..248085876 100644
--- a/src/utils/__tests__/features.test.ts
+++ b/src/utils/features.test.ts
@@ -3,7 +3,7 @@ import { buildInstance } from 'soapbox/jest/factory';
 import {
   parseVersion,
   getFeatures,
-} from '../features';
+} from './features';
 
 describe('parseVersion', () => {
   it('with Pleroma version string', () => {
diff --git a/src/utils/__tests__/html.test.ts b/src/utils/html.test.ts
similarity index 88%
rename from src/utils/__tests__/html.test.ts
rename to src/utils/html.test.ts
index ef9296e6c..cf0a62d1d 100644
--- a/src/utils/__tests__/html.test.ts
+++ b/src/utils/html.test.ts
@@ -1,4 +1,4 @@
-import * as html from '../html';
+import * as html from './html';
 
 describe('html', () => {
   describe('unsecapeHTML', () => {
diff --git a/src/utils/__tests__/input.test.ts b/src/utils/input.test.ts
similarity index 84%
rename from src/utils/__tests__/input.test.ts
rename to src/utils/input.test.ts
index 819a8fd82..4630126ea 100644
--- a/src/utils/__tests__/input.test.ts
+++ b/src/utils/input.test.ts
@@ -1,4 +1,4 @@
-import { normalizeUsername } from '../input';
+import { normalizeUsername } from './input';
 
 test('normalizeUsername', () => {
   expect(normalizeUsername('@alex')).toBe('alex');
diff --git a/src/utils/__tests__/media.test.ts b/src/utils/media.test.ts
similarity index 98%
rename from src/utils/__tests__/media.test.ts
rename to src/utils/media.test.ts
index 56a02aebc..cbfdac026 100644
--- a/src/utils/__tests__/media.test.ts
+++ b/src/utils/media.test.ts
@@ -1,4 +1,4 @@
-import { addAutoPlay } from '../media';
+import { addAutoPlay } from './media';
 
 describe('addAutoPlay()', () => {
   describe('when the provider is Rumble', () => {
diff --git a/src/utils/__tests__/numbers.test.tsx b/src/utils/numbers.test.tsx
similarity index 98%
rename from src/utils/__tests__/numbers.test.tsx
rename to src/utils/numbers.test.tsx
index 4dfbb577d..1d69e960d 100644
--- a/src/utils/__tests__/numbers.test.tsx
+++ b/src/utils/numbers.test.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 
-import { render, screen } from '../../jest/test-helpers';
-import { isIntegerId, secondsToDays, shortNumberFormat } from '../numbers';
+import { render, screen } from 'soapbox/jest/test-helpers';
+
+import { isIntegerId, secondsToDays, shortNumberFormat } from './numbers';
 
 test('isIntegerId()', () => {
   expect(isIntegerId('0')).toBe(true);
diff --git a/src/utils/__tests__/queries.test.ts b/src/utils/queries.test.ts
similarity index 99%
rename from src/utils/__tests__/queries.test.ts
rename to src/utils/queries.test.ts
index 7b817dc83..72e1f809e 100644
--- a/src/utils/__tests__/queries.test.ts
+++ b/src/utils/queries.test.ts
@@ -2,7 +2,7 @@ import { InfiniteData } from '@tanstack/react-query';
 
 import { queryClient } from 'soapbox/queries/client';
 
-import { PaginatedResult, sortQueryData, updatePageItem } from '../queries';
+import { PaginatedResult, sortQueryData, updatePageItem } from './queries';
 
 interface Item {
   id: number;
diff --git a/src/utils/__tests__/status.test.ts b/src/utils/status.test.ts
similarity index 98%
rename from src/utils/__tests__/status.test.ts
rename to src/utils/status.test.ts
index a3018114b..2528781fe 100644
--- a/src/utils/__tests__/status.test.ts
+++ b/src/utils/status.test.ts
@@ -4,7 +4,7 @@ import { buildStatus } from 'soapbox/jest/factory';
 import {
   hasIntegerMediaIds,
   defaultMediaVisibility,
-} from '../status';
+} from './status';
 
 describe('hasIntegerMediaIds()', () => {
   it('returns true for a Pleroma deleted status', () => {
diff --git a/src/utils/__tests__/tailwind.test.ts b/src/utils/tailwind.test.ts
similarity index 98%
rename from src/utils/__tests__/tailwind.test.ts
rename to src/utils/tailwind.test.ts
index 081d9cfd6..f234d5ac3 100644
--- a/src/utils/__tests__/tailwind.test.ts
+++ b/src/utils/tailwind.test.ts
@@ -1,6 +1,6 @@
 import { Map as ImmutableMap } from 'immutable';
 
-import { toTailwind, fromLegacyColors, expandPalette } from '../tailwind';
+import { toTailwind, fromLegacyColors, expandPalette } from './tailwind';
 
 describe('toTailwind()', () => {
   it('handles empty Soapbox config', () => {
diff --git a/src/utils/__tests__/timelines.test.ts b/src/utils/timelines.test.ts
similarity index 98%
rename from src/utils/__tests__/timelines.test.ts
rename to src/utils/timelines.test.ts
index 30732e162..9d27265f1 100644
--- a/src/utils/__tests__/timelines.test.ts
+++ b/src/utils/timelines.test.ts
@@ -2,7 +2,7 @@ import { fromJS } from 'immutable';
 
 import { buildStatus } from 'soapbox/jest/factory';
 
-import { shouldFilter } from '../timelines';
+import { shouldFilter } from './timelines';
 
 describe('shouldFilter', () => {
   it('returns false under normal circumstances', () => {
diff --git a/tailwind/__tests__/colors-test.js b/tailwind/colors.test.js
similarity index 98%
rename from tailwind/__tests__/colors-test.js
rename to tailwind/colors.test.js
index db5695e39..90ac55fd4 100644
--- a/tailwind/__tests__/colors-test.js
+++ b/tailwind/colors.test.js
@@ -1,7 +1,7 @@
 import {
   withOpacityValue,
   parseColorMatrix,
-} from '../colors.cjs';
+} from './colors.cjs';
 
 describe('withOpacityValue()', () => {
   it('returns a Tailwind color function with alpha support', () => {