diff --git a/packages/autocertifier-server/tsconfig.jest.json b/packages/autocertifier-server/tsconfig.jest.json
index 93d50ba1fe..2127d370c8 100644
--- a/packages/autocertifier-server/tsconfig.jest.json
+++ b/packages/autocertifier-server/tsconfig.jest.json
@@ -7,7 +7,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../autocertifier-client/tsconfig.node.json"}
     ]
diff --git a/packages/autocertifier-server/tsconfig.node.json b/packages/autocertifier-server/tsconfig.node.json
index 3d1159742f..8b9848aa67 100644
--- a/packages/autocertifier-server/tsconfig.node.json
+++ b/packages/autocertifier-server/tsconfig.node.json
@@ -10,7 +10,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../dht/tsconfig.node.json"}
     ]
diff --git a/packages/cdn-location/tsconfig.jest.json b/packages/cdn-location/tsconfig.jest.json
index 6f891a1ed0..39ef7b1ba2 100644
--- a/packages/cdn-location/tsconfig.jest.json
+++ b/packages/cdn-location/tsconfig.jest.json
@@ -7,7 +7,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../autocertifier-client/tsconfig.node.json"}
     ]
diff --git a/packages/cdn-location/tsconfig.node.json b/packages/cdn-location/tsconfig.node.json
index 804c7ec519..b7b109b894 100644
--- a/packages/cdn-location/tsconfig.node.json
+++ b/packages/cdn-location/tsconfig.node.json
@@ -9,6 +9,6 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" }
+        { "path": "../test-utils" }
     ]
 }
diff --git a/packages/dht/tsconfig.jest.json b/packages/dht/tsconfig.jest.json
index 87227b54d0..f98a137ce3 100644
--- a/packages/dht/tsconfig.jest.json
+++ b/packages/dht/tsconfig.jest.json
@@ -13,7 +13,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../autocertifier-client/tsconfig.node.json" },
         { "path": "../cdn-location/tsconfig.node.json" },
diff --git a/packages/dht/tsconfig.node.json b/packages/dht/tsconfig.node.json
index 23dca9ac98..a6d616162d 100644
--- a/packages/dht/tsconfig.node.json
+++ b/packages/dht/tsconfig.node.json
@@ -11,7 +11,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../proto-rpc/tsconfig.node.json" },
         { "path": "../autocertifier-client/tsconfig.node.json" },
         { "path": "../cdn-location/tsconfig.node.json" },
diff --git a/packages/node/tsconfig.jest.json b/packages/node/tsconfig.jest.json
index 2a21c5c8b5..2dd21ddfb2 100644
--- a/packages/node/tsconfig.jest.json
+++ b/packages/node/tsconfig.jest.json
@@ -9,7 +9,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../sdk/tsconfig.node.json" }
     ]
 }
diff --git a/packages/node/tsconfig.node.json b/packages/node/tsconfig.node.json
index 94448457eb..279c871b50 100644
--- a/packages/node/tsconfig.node.json
+++ b/packages/node/tsconfig.node.json
@@ -11,7 +11,7 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../sdk/tsconfig.node.json" }
     ]
 }
diff --git a/packages/proto-rpc/tsconfig.jest.json b/packages/proto-rpc/tsconfig.jest.json
index 57b0c88b4a..678731194f 100644
--- a/packages/proto-rpc/tsconfig.jest.json
+++ b/packages/proto-rpc/tsconfig.jest.json
@@ -11,6 +11,6 @@
     ],
     "references": [
         { "path": "../utils/tsconfig.node.json" },
-        { "path": "../test-utils/tsconfig.node.json" }
+        { "path": "../test-utils" }
     ]
 }
diff --git a/packages/sdk/tsconfig.browser.json b/packages/sdk/tsconfig.browser.json
index e8446f523f..0fe5fbab3d 100644
--- a/packages/sdk/tsconfig.browser.json
+++ b/packages/sdk/tsconfig.browser.json
@@ -18,7 +18,7 @@
     ],
     "exclude": ["src/exports-esm.mjs"],
     "references": [
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../trackerless-network/tsconfig.browser.json" }
     ]
 }
diff --git a/packages/sdk/tsconfig.jest.json b/packages/sdk/tsconfig.jest.json
index 5d3dcc75b6..3e635d60d3 100644
--- a/packages/sdk/tsconfig.jest.json
+++ b/packages/sdk/tsconfig.jest.json
@@ -25,7 +25,7 @@
         "src/exports-esm.mjs"
     ],
     "references": [
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../dht/tsconfig.node.json" },
         { "path": "../trackerless-network/tsconfig.node.json" }
     ]
diff --git a/packages/sdk/tsconfig.node.json b/packages/sdk/tsconfig.node.json
index d5fa7a540f..1077fb5651 100644
--- a/packages/sdk/tsconfig.node.json
+++ b/packages/sdk/tsconfig.node.json
@@ -19,7 +19,7 @@
         "jest.config.ts"
     ],
     "references": [
-        { "path": "../test-utils/tsconfig.node.json" },
+        { "path": "../test-utils" },
         { "path": "../trackerless-network/tsconfig.node.json" },
         { "path": "../dht/tsconfig.node.json" }
 
diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json
index 4732141697..97b13b9959 100644
--- a/packages/test-utils/package.json
+++ b/packages/test-utils/package.json
@@ -16,8 +16,8 @@
     "customMatcherTypes.d.ts"
   ],
   "scripts": {
-    "build": "tsc --build tsconfig.node.json",
-    "check": "tsc -p ./tsconfig.jest.json",
+    "build": "tsc -b",
+    "check": "tsc -p ./tsconfig.jest.json && tsc --noEmit -p ./tsconfig.node.json",
     "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "test": "jest",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'"
diff --git a/packages/test-utils/tsconfig.jest.json b/packages/test-utils/tsconfig.jest.json
index 8021ad7fbd..deb01d41ba 100644
--- a/packages/test-utils/tsconfig.jest.json
+++ b/packages/test-utils/tsconfig.jest.json
@@ -1,10 +1,7 @@
 {
-    "extends": "../../tsconfig.jest.json",
-    "include": [
-        "src/**/*",
-        "test/**/*"
-    ],
-    "references": [
-        { "path": "../utils/tsconfig.node.json" }
-    ]
+  "extends": "../../tsconfig.jest.json",
+  "include": ["test"],
+  "references": [
+    { "path": "./tsconfig.node.json" }
+  ]
 }
diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json
index 09dd390ce2..41dc0a8b2e 100644
--- a/packages/test-utils/tsconfig.json
+++ b/packages/test-utils/tsconfig.json
@@ -1,3 +1,10 @@
 {
-  "extends": "./tsconfig.jest.json"
+  "files": [],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    { "path": "./tsconfig.jest.json" },
+    { "path": "./tsconfig.node.json" }
+  ]
 }
diff --git a/packages/test-utils/tsconfig.node.json b/packages/test-utils/tsconfig.node.json
index af9c79d535..7f47174ab6 100644
--- a/packages/test-utils/tsconfig.node.json
+++ b/packages/test-utils/tsconfig.node.json
@@ -1,13 +1,14 @@
 {
-    "extends": "../../tsconfig.node.json",
-    "compilerOptions": {
-        "outDir": "dist",
-        "types": ["node", "jest"]
-    },
-    "include": [
-        "src/**/*"
-    ],
-    "references": [
-        { "path": "../utils/tsconfig.node.json" }
+  "extends": "../../tsconfig.node.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "types": [
+      "node",
+      "jest"
     ]
+  },
+  "include": ["src"],
+  "references": [
+    { "path": "../utils/tsconfig.node.json" }
+  ]
 }
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 0000000000..63646ddf92
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,6 @@
+{
+  "files": [],
+  "references": [
+    { "path": "./packages/test-utils" }
+  ]
+}