diff --git a/test/Singleflight-test.ts b/test/utils/Singleflight-test.ts
similarity index 98%
rename from test/Singleflight-test.ts
rename to test/utils/Singleflight-test.ts
index 4f0c6e0da3..80258701bb 100644
--- a/test/Singleflight-test.ts
+++ b/test/utils/Singleflight-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {Singleflight} from "../src/utils/Singleflight";
+import {Singleflight} from "../../src/utils/Singleflight";
 
 describe('Singleflight', () => {
     afterEach(() => {
diff --git a/test/arrays-test.ts b/test/utils/arrays-test.ts
similarity index 99%
rename from test/arrays-test.ts
rename to test/utils/arrays-test.ts
index 33c4ee452e..ececd274b2 100644
--- a/test/arrays-test.ts
+++ b/test/utils/arrays-test.ts
@@ -25,8 +25,8 @@ import {
     arrayUnion,
     ArrayUtil,
     GroupedArray,
-} from "../src/utils/arrays";
-import {objectFromEntries} from "../src/utils/objects";
+} from "../../src/utils/arrays";
+import {objectFromEntries} from "../../src/utils/objects";
 
 function expectSample(i: number, input: number[], expected: number[]) {
     console.log(`Resample case index: ${i}`); // for debugging test failures
diff --git a/test/enums-test.ts b/test/utils/enums-test.ts
similarity index 96%
rename from test/enums-test.ts
rename to test/utils/enums-test.ts
index e519186a51..423b135f77 100644
--- a/test/enums-test.ts
+++ b/test/utils/enums-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {getEnumValues, isEnumValue} from "../src/utils/enums";
+import {getEnumValues, isEnumValue} from "../../src/utils/enums";
 
 enum TestStringEnum {
     First = "__first__",
diff --git a/test/iterables-test.ts b/test/utils/iterables-test.ts
similarity index 97%
rename from test/iterables-test.ts
rename to test/utils/iterables-test.ts
index af0232fb93..9b30b6241c 100644
--- a/test/iterables-test.ts
+++ b/test/utils/iterables-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {iterableDiff, iterableUnion} from "../src/utils/iterables";
+import {iterableDiff, iterableUnion} from "../../src/utils/iterables";
 
 describe('iterables', () => {
     describe('iterableUnion', () => {
diff --git a/test/maps-test.ts b/test/utils/maps-test.ts
similarity index 99%
rename from test/maps-test.ts
rename to test/utils/maps-test.ts
index 5363ab3d03..8764a8f2cf 100644
--- a/test/maps-test.ts
+++ b/test/utils/maps-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {EnhancedMap, mapDiff, mapKeyChanges} from "../src/utils/maps";
+import {EnhancedMap, mapDiff, mapKeyChanges} from "../../src/utils/maps";
 
 describe('maps', () => {
     describe('mapDiff', () => {
diff --git a/test/numbers-test.ts b/test/utils/numbers-test.ts
similarity index 99%
rename from test/numbers-test.ts
rename to test/utils/numbers-test.ts
index 6e0e3f58ce..36e7d4f7e7 100644
--- a/test/numbers-test.ts
+++ b/test/utils/numbers-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {clamp, defaultNumber, percentageOf, percentageWithin, sum} from "../src/utils/numbers";
+import {clamp, defaultNumber, percentageOf, percentageWithin, sum} from "../../src/utils/numbers";
 
 describe('numbers', () => {
     describe('defaultNumber', () => {
diff --git a/test/objects-test.ts b/test/utils/objects-test.ts
similarity index 99%
rename from test/objects-test.ts
rename to test/utils/objects-test.ts
index 912d371ba2..b7a80e6761 100644
--- a/test/objects-test.ts
+++ b/test/utils/objects-test.ts
@@ -23,7 +23,7 @@ import {
     objectKeyChanges,
     objectShallowClone,
     objectWithOnly,
-} from "../src/utils/objects";
+} from "../../src/utils/objects";
 
 describe('objects', () => {
     describe('objectExcluding', () => {
diff --git a/test/sets-test.ts b/test/utils/sets-test.ts
similarity index 97%
rename from test/sets-test.ts
rename to test/utils/sets-test.ts
index e884d0e9af..98dc218309 100644
--- a/test/sets-test.ts
+++ b/test/utils/sets-test.ts
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import {setHasDiff} from "../src/utils/sets";
+import {setHasDiff} from "../../src/utils/sets";
 
 describe('sets', () => {
     describe('setHasDiff', () => {