From 92f97080441ae572f0777559facb18127c8bbff3 Mon Sep 17 00:00:00 2001
From: Brad Zacher <brad.zacher@gmail.com>
Date: Fri, 2 Feb 2024 11:28:11 +1030
Subject: [PATCH] chore: cleanup test-utils naming/locations

---
 packages/parser/jest.config.js                                | 2 +-
 .../__snapshots__/{services.ts.snap => services.test.ts.snap} | 0
 packages/parser/tests/lib/{parser.ts => parser.test.ts}       | 0
 packages/parser/tests/lib/{services.ts => services.test.ts}   | 2 +-
 packages/parser/tests/lib/{tsx.ts => tsx.test.ts}             | 2 +-
 packages/parser/tests/{tools => test-utils}/test-utils.ts     | 0
 .../parser/tests/{tools => test-utils}/ts-error-serializer.ts | 0
 packages/scope-manager/jest.config.js                         | 2 +-
 packages/scope-manager/tests/eslint-scope/arguments.test.ts   | 2 +-
 packages/scope-manager/tests/eslint-scope/catch-scope.test.ts | 2 +-
 .../tests/eslint-scope/child-visitor-keys.test.ts             | 2 +-
 .../scope-manager/tests/eslint-scope/class-fields.test.ts     | 2 +-
 .../tests/eslint-scope/es6-arrow-function-expression.test.ts  | 2 +-
 .../scope-manager/tests/eslint-scope/es6-block-scope.test.ts  | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-catch.test.ts   | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-class.test.ts   | 2 +-
 .../tests/eslint-scope/es6-default-parameters.test.ts         | 2 +-
 .../tests/eslint-scope/es6-destructuring-assignments.test.ts  | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-export.test.ts  | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-import.test.ts  | 4 ++--
 .../tests/eslint-scope/es6-iteration-scope.test.ts            | 2 +-
 .../scope-manager/tests/eslint-scope/es6-new-target.test.ts   | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-object.test.ts  | 2 +-
 .../scope-manager/tests/eslint-scope/es6-rest-args.test.ts    | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-super.test.ts   | 2 +-
 packages/scope-manager/tests/eslint-scope/es6-switch.test.ts  | 2 +-
 .../tests/eslint-scope/es6-template-literal.test.ts           | 2 +-
 .../tests/eslint-scope/function-expression-name.test.ts       | 2 +-
 .../tests/eslint-scope/get-declared-variables.test.ts         | 2 +-
 .../scope-manager/tests/eslint-scope/global-increment.test.ts | 2 +-
 .../scope-manager/tests/eslint-scope/global-return.test.ts    | 4 ++--
 .../tests/eslint-scope/implicit-global-reference.test.ts      | 2 +-
 .../scope-manager/tests/eslint-scope/implied-strict.test.ts   | 2 +-
 packages/scope-manager/tests/eslint-scope/label.test.ts       | 2 +-
 packages/scope-manager/tests/eslint-scope/references.test.ts  | 2 +-
 packages/scope-manager/tests/eslint-scope/typescript.test.ts  | 2 +-
 packages/scope-manager/tests/eslint-scope/with-scope.test.ts  | 2 +-
 packages/scope-manager/tests/fixtures.test.ts                 | 4 ++--
 packages/scope-manager/tests/lib.test.ts                      | 2 +-
 packages/scope-manager/tests/{util => test-utils}/expect.ts   | 0
 .../tests/{util => test-utils}/getSpecificNode.ts             | 0
 packages/scope-manager/tests/{util => test-utils}/index.ts    | 0
 packages/scope-manager/tests/{util => test-utils}/misc.ts     | 0
 packages/scope-manager/tests/{util => test-utils}/parse.ts    | 0
 .../tests/{util => test-utils}/serializers/DefinitionBase.ts  | 0
 .../tests/{util => test-utils}/serializers/Reference.ts       | 0
 .../tests/{util => test-utils}/serializers/ScopeBase.ts       | 0
 .../tests/{util => test-utils}/serializers/ScopeManager.ts    | 0
 .../tests/{util => test-utils}/serializers/TSESTreeNode.ts    | 0
 .../tests/{util => test-utils}/serializers/Variable.ts        | 0
 .../tests/{util => test-utils}/serializers/baseSerializer.ts  | 0
 .../tests/{util => test-utils}/serializers/index.ts           | 0
 packages/scope-manager/tests/types/reference-type.test.ts     | 2 +-
 .../scope-manager/tests/types/variable-definition.test.ts     | 2 +-
 packages/typescript-estree/tests/lib/semanticInfo.test.ts     | 4 ++--
 .../tests/{lib => }/test-utils/expectToHaveParserServices.ts  | 2 +-
 .../{tools => tests/test-utils}/test-utils.ts                 | 4 ++--
 .../{tools => tests/test-utils}/tserror-serializer.ts         | 2 +-
 58 files changed, 46 insertions(+), 46 deletions(-)
 rename packages/parser/tests/lib/__snapshots__/{services.ts.snap => services.test.ts.snap} (100%)
 rename packages/parser/tests/lib/{parser.ts => parser.test.ts} (100%)
 rename packages/parser/tests/lib/{services.ts => services.test.ts} (97%)
 rename packages/parser/tests/lib/{tsx.ts => tsx.test.ts} (97%)
 rename packages/parser/tests/{tools => test-utils}/test-utils.ts (100%)
 rename packages/parser/tests/{tools => test-utils}/ts-error-serializer.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/expect.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/getSpecificNode.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/index.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/misc.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/parse.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/DefinitionBase.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/Reference.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/ScopeBase.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/ScopeManager.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/TSESTreeNode.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/Variable.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/baseSerializer.ts (100%)
 rename packages/scope-manager/tests/{util => test-utils}/serializers/index.ts (100%)
 rename packages/typescript-estree/tests/{lib => }/test-utils/expectToHaveParserServices.ts (94%)
 rename packages/typescript-estree/{tools => tests/test-utils}/test-utils.ts (99%)
 rename packages/typescript-estree/{tools => tests/test-utils}/tserror-serializer.ts (93%)

diff --git a/packages/parser/jest.config.js b/packages/parser/jest.config.js
index 5a7d0fc5112b..7dd5748f98bb 100644
--- a/packages/parser/jest.config.js
+++ b/packages/parser/jest.config.js
@@ -4,5 +4,5 @@
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
   ...require('../../jest.config.base.js'),
-  testRegex: './tests/lib/.+\\.ts$',
+  testRegex: './tests/lib/.+\\.test\\.ts$',
 };
diff --git a/packages/parser/tests/lib/__snapshots__/services.ts.snap b/packages/parser/tests/lib/__snapshots__/services.test.ts.snap
similarity index 100%
rename from packages/parser/tests/lib/__snapshots__/services.ts.snap
rename to packages/parser/tests/lib/__snapshots__/services.test.ts.snap
diff --git a/packages/parser/tests/lib/parser.ts b/packages/parser/tests/lib/parser.test.ts
similarity index 100%
rename from packages/parser/tests/lib/parser.ts
rename to packages/parser/tests/lib/parser.test.ts
diff --git a/packages/parser/tests/lib/services.ts b/packages/parser/tests/lib/services.test.ts
similarity index 97%
rename from packages/parser/tests/lib/services.ts
rename to packages/parser/tests/lib/services.test.ts
index 673512e5ed2d..8532ec979ada 100644
--- a/packages/parser/tests/lib/services.ts
+++ b/packages/parser/tests/lib/services.test.ts
@@ -8,7 +8,7 @@ import {
   createSnapshotTestBlock,
   formatSnapshotName,
   testServices,
-} from '../tools/test-utils';
+} from '../test-utils/test-utils';
 
 //------------------------------------------------------------------------------
 // Setup
diff --git a/packages/parser/tests/lib/tsx.ts b/packages/parser/tests/lib/tsx.test.ts
similarity index 97%
rename from packages/parser/tests/lib/tsx.ts
rename to packages/parser/tests/lib/tsx.test.ts
index 40ae54250f65..5258b6ec2c93 100644
--- a/packages/parser/tests/lib/tsx.ts
+++ b/packages/parser/tests/lib/tsx.test.ts
@@ -1,7 +1,7 @@
 import type { ParserOptions } from '@typescript-eslint/types';
 
 import { parseForESLint } from '../../src/parser';
-import { serializer } from '../tools/ts-error-serializer';
+import { serializer } from '../test-utils/ts-error-serializer';
 
 //------------------------------------------------------------------------------
 // Tests
diff --git a/packages/parser/tests/tools/test-utils.ts b/packages/parser/tests/test-utils/test-utils.ts
similarity index 100%
rename from packages/parser/tests/tools/test-utils.ts
rename to packages/parser/tests/test-utils/test-utils.ts
diff --git a/packages/parser/tests/tools/ts-error-serializer.ts b/packages/parser/tests/test-utils/ts-error-serializer.ts
similarity index 100%
rename from packages/parser/tests/tools/ts-error-serializer.ts
rename to packages/parser/tests/test-utils/ts-error-serializer.ts
diff --git a/packages/scope-manager/jest.config.js b/packages/scope-manager/jest.config.js
index e9aff2600f8e..76d213aa524f 100644
--- a/packages/scope-manager/jest.config.js
+++ b/packages/scope-manager/jest.config.js
@@ -9,6 +9,6 @@ module.exports = {
   ...baseConfig,
   setupFilesAfterEnv: [
     ...baseConfig.setupFilesAfterEnv,
-    './tests/util/serializers/index.ts',
+    './tests/test-utils/serializers/index.ts',
   ],
 };
diff --git a/packages/scope-manager/tests/eslint-scope/arguments.test.ts b/packages/scope-manager/tests/eslint-scope/arguments.test.ts
index 1fe69e2bdf03..72a6ed5f8e42 100644
--- a/packages/scope-manager/tests/eslint-scope/arguments.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/arguments.test.ts
@@ -3,7 +3,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('arguments', () => {
   it('arguments are correctly materialized', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/catch-scope.test.ts b/packages/scope-manager/tests/eslint-scope/catch-scope.test.ts
index 0a2a2b53412f..97095a449d86 100644
--- a/packages/scope-manager/tests/eslint-scope/catch-scope.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/catch-scope.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('catch', () => {
   it('creates scope', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/child-visitor-keys.test.ts b/packages/scope-manager/tests/eslint-scope/child-visitor-keys.test.ts
index 0e9d7faf9cfa..e005efba09c9 100644
--- a/packages/scope-manager/tests/eslint-scope/child-visitor-keys.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/child-visitor-keys.test.ts
@@ -1,7 +1,7 @@
 import type { TSESTree } from '@typescript-eslint/types';
 
 import { analyze } from '../../src/analyze';
-import { parse } from '../util';
+import { parse } from '../test-utils';
 
 describe('childVisitorKeys option', () => {
   it('should not visit to properties which are not given.', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/class-fields.test.ts b/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
index 504cd5880ae6..b806947a5d81 100644
--- a/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/class-fields.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   expectToBeIdentifier,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('Class fields', () => {
   it('class C { f = g }', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-arrow-function-expression.test.ts b/packages/scope-manager/tests/eslint-scope/es6-arrow-function-expression.test.ts
index 8545a278fca4..8970dc030cfe 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-arrow-function-expression.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-arrow-function-expression.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 arrow function expression', () => {
   it('materialize scope for arrow function expression', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-block-scope.test.ts b/packages/scope-manager/tests/eslint-scope/es6-block-scope.test.ts
index 831d8954fc4b..3c52ba16678a 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-block-scope.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-block-scope.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 block scope', () => {
   it('let is materialized in ES6 block scope#1', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-catch.test.ts b/packages/scope-manager/tests/eslint-scope/es6-catch.test.ts
index a1a31a4c0f7e..ce17e098b8b4 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-catch.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-catch.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 catch', () => {
   it('takes binding pattern', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-class.test.ts b/packages/scope-manager/tests/eslint-scope/es6-class.test.ts
index 3138b1c5f75b..48ecb1ecab87 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-class.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-class.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 class', () => {
   it('declaration name creates class scope', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-default-parameters.test.ts b/packages/scope-manager/tests/eslint-scope/es6-default-parameters.test.ts
index 9fa61d522324..8606e6029210 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-default-parameters.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-default-parameters.test.ts
@@ -1,4 +1,4 @@
-import { getRealVariables, parseAndAnalyze } from '../util';
+import { getRealVariables, parseAndAnalyze } from '../test-utils';
 
 function forEach<T extends string>(
   obj: Record<T, string>,
diff --git a/packages/scope-manager/tests/eslint-scope/es6-destructuring-assignments.test.ts b/packages/scope-manager/tests/eslint-scope/es6-destructuring-assignments.test.ts
index 20e73e1f485b..225c240a0c08 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-destructuring-assignments.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-destructuring-assignments.test.ts
@@ -7,7 +7,7 @@ import {
   expectToBeParameterDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 destructuring assignments', () => {
   it('Pattern in var in ForInStatement', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-export.test.ts b/packages/scope-manager/tests/eslint-scope/es6-export.test.ts
index ecb6d261b54d..3737cedfa115 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-export.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-export.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeVariableDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('export declaration', () => {
   // http://people.mozilla.org/~jorendorff/es6-draft.html#sec-static-and-runtme-semantics-module-records
diff --git a/packages/scope-manager/tests/eslint-scope/es6-import.test.ts b/packages/scope-manager/tests/eslint-scope/es6-import.test.ts
index 38319a79bf63..2fdb2867f60b 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-import.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-import.test.ts
@@ -4,8 +4,8 @@ import {
   expectToBeModuleScope,
   expectToBeVariableDefinition,
   getRealVariables,
-} from '../util';
-import { parseAndAnalyze } from '../util/parse';
+} from '../test-utils';
+import { parseAndAnalyze } from '../test-utils/parse';
 
 describe('import declaration', () => {
   // http://people.mozilla.org/~jorendorff/es6-draft.html#sec-static-and-runtme-semantics-module-records
diff --git a/packages/scope-manager/tests/eslint-scope/es6-iteration-scope.test.ts b/packages/scope-manager/tests/eslint-scope/es6-iteration-scope.test.ts
index 07d7729940b8..399e923f3698 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-iteration-scope.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-iteration-scope.test.ts
@@ -6,7 +6,7 @@ import {
   expectToBeVariableDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 iteration scope', () => {
   it('let materialize iteration scope for ForInStatement#1', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts b/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
index 72d15a196ce6..3cb9c85278c6 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-new-target.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeFunctionScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 new.target', () => {
   it('should not make references of new.target', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-object.test.ts b/packages/scope-manager/tests/eslint-scope/es6-object.test.ts
index 5b39f7d23b01..8199bc216678 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-object.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-object.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 object', () => {
   it('method definition', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-rest-args.test.ts b/packages/scope-manager/tests/eslint-scope/es6-rest-args.test.ts
index e48ac9716c70..db94be40e414 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-rest-args.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-rest-args.test.ts
@@ -7,7 +7,7 @@ import {
   expectToBeParameterDefinition,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 rest arguments', () => {
   it('materialize rest argument in scope', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-super.test.ts b/packages/scope-manager/tests/eslint-scope/es6-super.test.ts
index 87d25ff7aaa4..f8a6b303b0aa 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-super.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-super.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 super', () => {
   it('is not handled as reference', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-switch.test.ts b/packages/scope-manager/tests/eslint-scope/es6-switch.test.ts
index d0280769b27b..774043cabf8e 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-switch.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-switch.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeSwitchScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 switch', () => {
   it('materialize scope', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/es6-template-literal.test.ts b/packages/scope-manager/tests/eslint-scope/es6-template-literal.test.ts
index a263f305eaef..897863b8d8fc 100644
--- a/packages/scope-manager/tests/eslint-scope/es6-template-literal.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/es6-template-literal.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('ES6 template literal', () => {
   it('refer variables', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/function-expression-name.test.ts b/packages/scope-manager/tests/eslint-scope/function-expression-name.test.ts
index 18536ab7f002..a6cd9ebcdf0f 100644
--- a/packages/scope-manager/tests/eslint-scope/function-expression-name.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/function-expression-name.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('function name', () => {
   it('should create its special scope', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/get-declared-variables.test.ts b/packages/scope-manager/tests/eslint-scope/get-declared-variables.test.ts
index 5a19f01debf0..dc1c93cd778e 100644
--- a/packages/scope-manager/tests/eslint-scope/get-declared-variables.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/get-declared-variables.test.ts
@@ -3,7 +3,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { simpleTraverse } from '@typescript-eslint/typescript-estree';
 
 import { analyze } from '../../src/analyze';
-import { parse } from '../util/parse';
+import { parse } from '../test-utils/parse';
 
 describe('ScopeManager.prototype.getDeclaredVariables', () => {
   function verify(
diff --git a/packages/scope-manager/tests/eslint-scope/global-increment.test.ts b/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
index 7cf86508d334..5dac28e14e48 100644
--- a/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/global-increment.test.ts
@@ -2,7 +2,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('global increment', () => {
   it('becomes read/write', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/global-return.test.ts b/packages/scope-manager/tests/eslint-scope/global-return.test.ts
index 8293dd8d8675..dd99bdaadb11 100644
--- a/packages/scope-manager/tests/eslint-scope/global-return.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/global-return.test.ts
@@ -6,8 +6,8 @@ import {
   expectToBeImportBindingDefinition,
   expectToBeModuleScope,
   getRealVariables,
-} from '../util';
-import { parseAndAnalyze } from '../util/parse';
+} from '../test-utils';
+import { parseAndAnalyze } from '../test-utils/parse';
 
 describe('gloablReturn option', () => {
   it('creates a function scope following the global scope immediately', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts b/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
index 22f27ed5d663..8027bcaf59c3 100644
--- a/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/implicit-global-reference.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('implicit global reference', () => {
   it('assignments global scope', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/implied-strict.test.ts b/packages/scope-manager/tests/eslint-scope/implied-strict.test.ts
index 893da6048c28..8d396fecff09 100644
--- a/packages/scope-manager/tests/eslint-scope/implied-strict.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/implied-strict.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   expectToBeModuleScope,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('impliedStrict option', () => {
   it('ensures all user scopes are strict', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/label.test.ts b/packages/scope-manager/tests/eslint-scope/label.test.ts
index e68c841f2e97..7f13c194ee08 100644
--- a/packages/scope-manager/tests/eslint-scope/label.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/label.test.ts
@@ -4,7 +4,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('label', () => {
   it('should not create variables', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/references.test.ts b/packages/scope-manager/tests/eslint-scope/references.test.ts
index 0b49cab0f7f5..c7973556f269 100644
--- a/packages/scope-manager/tests/eslint-scope/references.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/references.test.ts
@@ -1,4 +1,4 @@
-import { getRealVariables, parseAndAnalyze } from '../util';
+import { getRealVariables, parseAndAnalyze } from '../test-utils';
 
 describe('References:', () => {
   describe('When there is a `let` declaration on global,', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/typescript.test.ts b/packages/scope-manager/tests/eslint-scope/typescript.test.ts
index 6cdb4340573d..7fad466a85d7 100644
--- a/packages/scope-manager/tests/eslint-scope/typescript.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/typescript.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeGlobalScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('typescript', () => {
   describe('multiple call signatures', () => {
diff --git a/packages/scope-manager/tests/eslint-scope/with-scope.test.ts b/packages/scope-manager/tests/eslint-scope/with-scope.test.ts
index a2bfe13b07cc..91114397b591 100644
--- a/packages/scope-manager/tests/eslint-scope/with-scope.test.ts
+++ b/packages/scope-manager/tests/eslint-scope/with-scope.test.ts
@@ -5,7 +5,7 @@ import {
   expectToBeWithScope,
   getRealVariables,
   parseAndAnalyze,
-} from '../util';
+} from '../test-utils';
 
 describe('with', () => {
   it('creates scope', () => {
diff --git a/packages/scope-manager/tests/fixtures.test.ts b/packages/scope-manager/tests/fixtures.test.ts
index 9593a9a45a6a..94510960bd97 100644
--- a/packages/scope-manager/tests/fixtures.test.ts
+++ b/packages/scope-manager/tests/fixtures.test.ts
@@ -3,8 +3,8 @@ import glob = require('glob');
 import makeDir from 'make-dir';
 import path from 'path';
 
-import type { AnalyzeOptions } from './util';
-import { parseAndAnalyze } from './util';
+import type { AnalyzeOptions } from './test-utils';
+import { parseAndAnalyze } from './test-utils';
 
 // Assign a segment set to this variable to limit the test to only this segment
 // This is super helpful if you need to debug why a specific fixture isn't producing the correct output
diff --git a/packages/scope-manager/tests/lib.test.ts b/packages/scope-manager/tests/lib.test.ts
index 81ed1789088e..eb558f3eb6e9 100644
--- a/packages/scope-manager/tests/lib.test.ts
+++ b/packages/scope-manager/tests/lib.test.ts
@@ -1,5 +1,5 @@
 import { ImplicitLibVariable } from '../src';
-import { parseAndAnalyze } from './util';
+import { parseAndAnalyze } from './test-utils';
 
 describe('implicit lib definitions', () => {
   it('should define no implicit variables if provided an empty array', () => {
diff --git a/packages/scope-manager/tests/util/expect.ts b/packages/scope-manager/tests/test-utils/expect.ts
similarity index 100%
rename from packages/scope-manager/tests/util/expect.ts
rename to packages/scope-manager/tests/test-utils/expect.ts
diff --git a/packages/scope-manager/tests/util/getSpecificNode.ts b/packages/scope-manager/tests/test-utils/getSpecificNode.ts
similarity index 100%
rename from packages/scope-manager/tests/util/getSpecificNode.ts
rename to packages/scope-manager/tests/test-utils/getSpecificNode.ts
diff --git a/packages/scope-manager/tests/util/index.ts b/packages/scope-manager/tests/test-utils/index.ts
similarity index 100%
rename from packages/scope-manager/tests/util/index.ts
rename to packages/scope-manager/tests/test-utils/index.ts
diff --git a/packages/scope-manager/tests/util/misc.ts b/packages/scope-manager/tests/test-utils/misc.ts
similarity index 100%
rename from packages/scope-manager/tests/util/misc.ts
rename to packages/scope-manager/tests/test-utils/misc.ts
diff --git a/packages/scope-manager/tests/util/parse.ts b/packages/scope-manager/tests/test-utils/parse.ts
similarity index 100%
rename from packages/scope-manager/tests/util/parse.ts
rename to packages/scope-manager/tests/test-utils/parse.ts
diff --git a/packages/scope-manager/tests/util/serializers/DefinitionBase.ts b/packages/scope-manager/tests/test-utils/serializers/DefinitionBase.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/DefinitionBase.ts
rename to packages/scope-manager/tests/test-utils/serializers/DefinitionBase.ts
diff --git a/packages/scope-manager/tests/util/serializers/Reference.ts b/packages/scope-manager/tests/test-utils/serializers/Reference.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/Reference.ts
rename to packages/scope-manager/tests/test-utils/serializers/Reference.ts
diff --git a/packages/scope-manager/tests/util/serializers/ScopeBase.ts b/packages/scope-manager/tests/test-utils/serializers/ScopeBase.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/ScopeBase.ts
rename to packages/scope-manager/tests/test-utils/serializers/ScopeBase.ts
diff --git a/packages/scope-manager/tests/util/serializers/ScopeManager.ts b/packages/scope-manager/tests/test-utils/serializers/ScopeManager.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/ScopeManager.ts
rename to packages/scope-manager/tests/test-utils/serializers/ScopeManager.ts
diff --git a/packages/scope-manager/tests/util/serializers/TSESTreeNode.ts b/packages/scope-manager/tests/test-utils/serializers/TSESTreeNode.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/TSESTreeNode.ts
rename to packages/scope-manager/tests/test-utils/serializers/TSESTreeNode.ts
diff --git a/packages/scope-manager/tests/util/serializers/Variable.ts b/packages/scope-manager/tests/test-utils/serializers/Variable.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/Variable.ts
rename to packages/scope-manager/tests/test-utils/serializers/Variable.ts
diff --git a/packages/scope-manager/tests/util/serializers/baseSerializer.ts b/packages/scope-manager/tests/test-utils/serializers/baseSerializer.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/baseSerializer.ts
rename to packages/scope-manager/tests/test-utils/serializers/baseSerializer.ts
diff --git a/packages/scope-manager/tests/util/serializers/index.ts b/packages/scope-manager/tests/test-utils/serializers/index.ts
similarity index 100%
rename from packages/scope-manager/tests/util/serializers/index.ts
rename to packages/scope-manager/tests/test-utils/serializers/index.ts
diff --git a/packages/scope-manager/tests/types/reference-type.test.ts b/packages/scope-manager/tests/types/reference-type.test.ts
index 79825f2e9aa6..7fcccf199e49 100644
--- a/packages/scope-manager/tests/types/reference-type.test.ts
+++ b/packages/scope-manager/tests/types/reference-type.test.ts
@@ -1,6 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 
-import { getSpecificNode, parseAndAnalyze } from '../util';
+import { getSpecificNode, parseAndAnalyze } from '../test-utils';
 
 describe('referencing a type - positive', () => {
   it('records a reference when a type is referenced from a type', () => {
diff --git a/packages/scope-manager/tests/types/variable-definition.test.ts b/packages/scope-manager/tests/types/variable-definition.test.ts
index 4ed907805fc2..28c1cc19a5f5 100644
--- a/packages/scope-manager/tests/types/variable-definition.test.ts
+++ b/packages/scope-manager/tests/types/variable-definition.test.ts
@@ -1,6 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 
-import { getSpecificNode, parseAndAnalyze } from '../util';
+import { getSpecificNode, parseAndAnalyze } from '../test-utils';
 
 describe('variable definition', () => {
   it('defines a variable for a type declaration', () => {
diff --git a/packages/typescript-estree/tests/lib/semanticInfo.test.ts b/packages/typescript-estree/tests/lib/semanticInfo.test.ts
index 9b6d353d48c4..f5f78934a880 100644
--- a/packages/typescript-estree/tests/lib/semanticInfo.test.ts
+++ b/packages/typescript-estree/tests/lib/semanticInfo.test.ts
@@ -9,12 +9,12 @@ import type { ParseAndGenerateServicesResult } from '../../src/parser';
 import { parseAndGenerateServices } from '../../src/parser';
 import type { TSESTreeOptions } from '../../src/parser-options';
 import type { TSESTree } from '../../src/ts-estree';
+import { expectToHaveParserServices } from '../test-utils/expectToHaveParserServices';
 import {
   createSnapshotTestBlock,
   formatSnapshotName,
   parseCodeAndGenerateServices,
-} from '../../tools/test-utils';
-import { expectToHaveParserServices } from './test-utils/expectToHaveParserServices';
+} from '../test-utils/test-utils';
 
 const FIXTURES_DIR = './tests/fixtures/semanticInfo';
 const testFiles = glob.sync(`**/*.src.ts`, {
diff --git a/packages/typescript-estree/tests/lib/test-utils/expectToHaveParserServices.ts b/packages/typescript-estree/tests/test-utils/expectToHaveParserServices.ts
similarity index 94%
rename from packages/typescript-estree/tests/lib/test-utils/expectToHaveParserServices.ts
rename to packages/typescript-estree/tests/test-utils/expectToHaveParserServices.ts
index d087dd3c54b2..3b9f902b1886 100644
--- a/packages/typescript-estree/tests/lib/test-utils/expectToHaveParserServices.ts
+++ b/packages/typescript-estree/tests/test-utils/expectToHaveParserServices.ts
@@ -1,7 +1,7 @@
 import type {
   ParserServices,
   ParserServicesWithTypeInformation,
-} from '../../../src';
+} from '../../src';
 
 export function expectToHaveParserServices(
   services: ParserServices | null | undefined,
diff --git a/packages/typescript-estree/tools/test-utils.ts b/packages/typescript-estree/tests/test-utils/test-utils.ts
similarity index 99%
rename from packages/typescript-estree/tools/test-utils.ts
rename to packages/typescript-estree/tests/test-utils/test-utils.ts
index 7e37d4bac0c6..bb8fbf290136 100644
--- a/packages/typescript-estree/tools/test-utils.ts
+++ b/packages/typescript-estree/tests/test-utils/test-utils.ts
@@ -2,8 +2,8 @@ import type {
   ParseAndGenerateServicesResult,
   TSESTree,
   TSESTreeOptions,
-} from '../src';
-import { parse as parserParse, parseAndGenerateServices } from '../src';
+} from '../../src';
+import { parse as parserParse, parseAndGenerateServices } from '../../src';
 
 export function parseCodeAndGenerateServices(
   code: string,
diff --git a/packages/typescript-estree/tools/tserror-serializer.ts b/packages/typescript-estree/tests/test-utils/tserror-serializer.ts
similarity index 93%
rename from packages/typescript-estree/tools/tserror-serializer.ts
rename to packages/typescript-estree/tests/test-utils/tserror-serializer.ts
index dc6cfd1771c0..ebd0996e98c0 100644
--- a/packages/typescript-estree/tools/tserror-serializer.ts
+++ b/packages/typescript-estree/tests/test-utils/tserror-serializer.ts
@@ -1,6 +1,6 @@
 import type { Plugin } from 'pretty-format';
 
-import { TSError } from '../src/node-utils';
+import { TSError } from '../../src/node-utils';
 
 export const serializer: Plugin = {
   test: (val: unknown): val is TSError => val instanceof TSError,