diff --git a/frontend/app/component/form/data_entry/candidates_votes/CandidatesVotesForm.test.tsx b/frontend/app/component/form/data_entry/candidates_votes/CandidatesVotesForm.test.tsx
index f03106bdd..40cbf5fd4 100644
--- a/frontend/app/component/form/data_entry/candidates_votes/CandidatesVotesForm.test.tsx
+++ b/frontend/app/component/form/data_entry/candidates_votes/CandidatesVotesForm.test.tsx
@@ -10,6 +10,9 @@ import {
 } from "@kiesraad/api-mocks";
 import { getUrlMethodAndBody, overrideOnce, render, screen, server, within } from "@kiesraad/test";
 
+import { DataEntryProvider } from "../state/DataEntryProvider";
+import { DataEntryState } from "../state/types";
+import { defaultFormSection, overrideServerGetDataEntryResponse } from "../test.util";
 import {
   emptyDataEntryRequest,
   expectFieldsToBeInvalidAndToHaveAccessibleErrorMessage,
@@ -17,10 +20,7 @@ import {
   expectFieldsToHaveIconAndToHaveAccessibleName,
   expectFieldsToNotHaveIcon,
   getCandidateFullNamesFromMockData,
-} from "../../testHelperFunctions";
-import { DataEntryProvider } from "../state/DataEntryProvider";
-import { DataEntryState } from "../state/types";
-import { defaultFormSection, overrideServerGetDataEntryResponse } from "../test.util";
+} from "../testHelperFunctions";
 import { CandidatesVotesForm } from "./CandidatesVotesForm";
 
 const defaultDataEntryState: DataEntryState = {
diff --git a/frontend/app/component/form/data_entry/check_and_save/CheckAndSaveForm.test.tsx b/frontend/app/component/form/data_entry/check_and_save/CheckAndSaveForm.test.tsx
index be885399a..9565c7554 100644
--- a/frontend/app/component/form/data_entry/check_and_save/CheckAndSaveForm.test.tsx
+++ b/frontend/app/component/form/data_entry/check_and_save/CheckAndSaveForm.test.tsx
@@ -10,10 +10,10 @@ import {
 } from "@kiesraad/api-mocks";
 import { overrideOnce, renderReturningRouter, screen, server, within } from "@kiesraad/test";
 
-import { emptyDataEntryRequest, errorWarningMocks } from "../../testHelperFunctions";
 import { DataEntryProvider } from "../state/DataEntryProvider";
 import { DataEntryState } from "../state/types";
 import { defaultFormSection, overrideServerGetDataEntryResponse } from "../test.util";
+import { emptyDataEntryRequest, errorWarningMocks } from "../testHelperFunctions";
 import { CheckAndSaveForm } from "./CheckAndSaveForm";
 
 const defaultValues = emptyDataEntryRequest.data;
diff --git a/frontend/app/component/form/data_entry/differences/DifferenceForm.test.tsx b/frontend/app/component/form/data_entry/differences/DifferenceForm.test.tsx
index 6cce55e04..2b5e6b1ee 100644
--- a/frontend/app/component/form/data_entry/differences/DifferenceForm.test.tsx
+++ b/frontend/app/component/form/data_entry/differences/DifferenceForm.test.tsx
@@ -7,7 +7,7 @@ import {
   expectFieldsToBeValidAndToNotHaveAccessibleErrorMessage,
   expectFieldsToHaveIconAndToHaveAccessibleName,
   expectFieldsToNotHaveIcon,
-} from "app/component/form/testHelperFunctions";
+} from "app/component/form/data_entry/testHelperFunctions";
 
 import { POLLING_STATION_DATA_ENTRY_SAVE_REQUEST_BODY } from "@kiesraad/api";
 import {
diff --git a/frontend/app/component/form/data_entry/recounted/RecountedForm.test.tsx b/frontend/app/component/form/data_entry/recounted/RecountedForm.test.tsx
index e14cc3103..b1686efff 100644
--- a/frontend/app/component/form/data_entry/recounted/RecountedForm.test.tsx
+++ b/frontend/app/component/form/data_entry/recounted/RecountedForm.test.tsx
@@ -1,7 +1,7 @@
 import { userEvent } from "@testing-library/user-event";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
-import { emptyDataEntryRequest, errorWarningMocks } from "app/component/form/testHelperFunctions";
+import { emptyDataEntryRequest, errorWarningMocks } from "app/component/form/data_entry/testHelperFunctions";
 
 import { POLLING_STATION_DATA_ENTRY_SAVE_REQUEST_BODY, SaveDataEntryResponse } from "@kiesraad/api";
 import {
diff --git a/frontend/app/component/form/data_entry/state/dataEntryUtils.test.ts b/frontend/app/component/form/data_entry/state/dataEntryUtils.test.ts
index abc53a54d..bf44cd2cb 100644
--- a/frontend/app/component/form/data_entry/state/dataEntryUtils.test.ts
+++ b/frontend/app/component/form/data_entry/state/dataEntryUtils.test.ts
@@ -2,8 +2,8 @@ import { assert, describe, expect, test } from "vitest";
 
 import { ValidationResult } from "@kiesraad/api";
 
-import { errorWarningMocks } from "../../testHelperFunctions";
 import { defaultDataEntryState, initialValues } from "../test.util";
+import { errorWarningMocks } from "../testHelperFunctions";
 import {
   addValidationResultToFormState,
   formSectionComplete,
diff --git a/frontend/app/component/form/testHelperFunctions.ts b/frontend/app/component/form/data_entry/testHelperFunctions.ts
similarity index 100%
rename from frontend/app/component/form/testHelperFunctions.ts
rename to frontend/app/component/form/data_entry/testHelperFunctions.ts
diff --git a/frontend/app/component/form/useWatchForChanges.test.ts b/frontend/app/component/form/data_entry/useWatchForChanges.test.ts
similarity index 100%
rename from frontend/app/component/form/useWatchForChanges.test.ts
rename to frontend/app/component/form/data_entry/useWatchForChanges.test.ts
diff --git a/frontend/app/component/form/useWatchForChanges.ts b/frontend/app/component/form/data_entry/useWatchForChanges.ts
similarity index 100%
rename from frontend/app/component/form/useWatchForChanges.ts
rename to frontend/app/component/form/data_entry/useWatchForChanges.ts
diff --git a/frontend/app/component/form/data_entry/voters_and_votes/VotersAndVotesForm.test.tsx b/frontend/app/component/form/data_entry/voters_and_votes/VotersAndVotesForm.test.tsx
index 401c4d646..f99766199 100644
--- a/frontend/app/component/form/data_entry/voters_and_votes/VotersAndVotesForm.test.tsx
+++ b/frontend/app/component/form/data_entry/voters_and_votes/VotersAndVotesForm.test.tsx
@@ -8,7 +8,7 @@ import {
   expectFieldsToBeValidAndToNotHaveAccessibleErrorMessage,
   expectFieldsToHaveIconAndToHaveAccessibleName,
   expectFieldsToNotHaveIcon,
-} from "app/component/form/testHelperFunctions";
+} from "app/component/form/data_entry/testHelperFunctions";
 
 import {
   GetDataEntryResponse,
diff --git a/frontend/app/module/data_entry/DataEntry.integration.test.tsx b/frontend/app/module/data_entry/DataEntry.integration.test.tsx
index 40b442ad6..1b096c8f9 100644
--- a/frontend/app/module/data_entry/DataEntry.integration.test.tsx
+++ b/frontend/app/module/data_entry/DataEntry.integration.test.tsx
@@ -2,7 +2,7 @@ import { render as rtlRender, within } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { beforeEach, describe, expect, test, vi } from "vitest";
 
-import { errorWarningMocks } from "app/component/form/testHelperFunctions";
+import { errorWarningMocks } from "app/component/form/data_entry/testHelperFunctions";
 import { routes } from "app/routes";
 
 import { SaveDataEntryResponse } from "@kiesraad/api";
diff --git a/sigrid.yaml b/sigrid.yaml
index a2679b2f4..65582464d 100644
--- a/sigrid.yaml
+++ b/sigrid.yaml
@@ -65,10 +65,6 @@ components:
   - name: "(Frontend) app/component/form/data_entry"
     include:
       - ".*/frontend/app/component/form/data_entry/.*"
-      - ".*/frontend/app/component/form/testHelperFunctions.ts"
-      - ".*/frontend/app/component/form/useWatchForChanges.test.ts"
-      - ".*/frontend/app/component/form/useWatchForChanges.ts"
-      - ".*/frontend/app/component/pollingstation/.*"
   - name: "(Frontend) app/component/form/polling_station"
     include:
       - ".*/frontend/app/component/form/polling_station/.*"