diff --git a/ava-e2e.config.js b/ava-e2e.config.js
index faec9784..22a7d8e6 100644
--- a/ava-e2e.config.js
+++ b/ava-e2e.config.js
@@ -3,6 +3,7 @@ module.exports = {
   extensions: ['ts'],
   require: ['ts-node/register/transpile-only'],
   timeout: '2m',
+  verbose: true,
   // Due to permissions issues, Windows needs cache turned off
   cache: false
 };
diff --git a/ava.config.js b/ava.config.js
index 94315abb..a3a4b686 100644
--- a/ava.config.js
+++ b/ava.config.js
@@ -2,6 +2,7 @@ module.exports = {
   files: ['test/unit/*'],
   extensions: ['ts'],
   require: ['ts-node/register/transpile-only'],
+  verbose: true,
   // Due to permissions issues, Windows needs cache turned off
   cache: false
 };
diff --git a/package.json b/package.json
index 91a6f565..6efde5bd 100644
--- a/package.json
+++ b/package.json
@@ -13,9 +13,9 @@
     "build": "cross-env NODE_ENV=production webpack && tsc -b -v && cross-env BABEL_ENV=production babel target/renderer/bundle.js --out-file target/renderer/bundle.js --no-comments --minified",
     "lint": "eslint . --fix --ext .js,.jsx,.ts,.tsx,.json",
     "test": "yarn run lint && yarn run test:unit",
-    "test:unit": "ava",
+    "test:unit": "cross-env DEBUG=ava:watcher ava",
     "test:unit:watch": "yarn run test:unit -- --watch",
-    "test:e2e": "ava --config ava-e2e.config.js",
+    "test:e2e": "cross-env DEBUG=ava:watcher ava --config ava-e2e.config.js",
     "postinstall": "yarn run v8-snapshot && webpack --config-name hyper-app && yarn run install-app-deps-with-retry && yarn run rebuild-node-pty && cpy --cwd=target node_modules \"../../app/\" && husky && yarn run generate-schema",
     "install-app-deps-with-retry": "electron-builder install-app-deps || electron-builder install-app-deps || electron-builder install-app-deps",
     "rebuild-node-pty": "electron-rebuild -f -o node-pty -m target",
@@ -38,13 +38,23 @@
     "@electron/remote": "2.1.2",
     "@react-icons/all-files": "4.1.0",
     "@redux-devtools/extension": "^3.3.0",
+    "@xterm/addon-canvas": "0.7.0",
+    "@xterm/addon-fit": "0.10.0",
+    "@xterm/addon-image": "0.8.0",
+    "@xterm/addon-ligatures": "0.9.0",
+    "@xterm/addon-search": "0.15.0",
+    "@xterm/addon-unicode11": "0.8.0",
+    "@xterm/addon-web-links": "0.11.0",
+    "@xterm/addon-webgl": "0.18.0",
+    "@xterm/xterm": "5.5.0",
     "args": "5.0.3",
+    "ava": "https://github.com/quine-global/ava#5b287fbd9f8c24a84f083626f72b6f177002b2a6",
     "chalk": "5.3.0",
     "clsx": "2.1.1",
     "color": "4.2.3",
     "columnify": "1.6.0",
-    "electron-rebuild": "^3.2.9",
     "css-loader": "7.1.2",
+    "electron-rebuild": "^3.2.9",
     "got": "12.4.1",
     "json-loader": "0.5.7",
     "lodash": "4.17.21",
@@ -68,16 +78,7 @@
     "stylis": "3.5.4",
     "typescript-json-schema": "0.65.1",
     "uuid": "10.0.0",
-    "webpack-cli": "5.1.4",
-    "@xterm/xterm": "5.5.0",
-    "@xterm/addon-canvas": "0.7.0",
-    "@xterm/addon-fit": "0.10.0",
-    "@xterm/addon-image": "0.8.0",
-    "@xterm/addon-ligatures": "0.9.0",
-    "@xterm/addon-search": "0.15.0",
-    "@xterm/addon-unicode11": "0.8.0",
-    "@xterm/addon-web-links": "0.11.0",
-    "@xterm/addon-webgl": "0.18.0"
+    "webpack-cli": "5.1.4"
   },
   "devDependencies": {
     "@ava/babel": "2.0.0",
@@ -108,16 +109,15 @@
     "@types/uuid": "10.0.0",
     "@typescript-eslint/eslint-plugin": "7.0.0",
     "@typescript-eslint/parser": "6.21.0",
-    "ava": "6.2.0",
     "babel-loader": "9.2.1",
     "concurrently": "9.1.0",
     "copy-webpack-plugin": "12.0.2",
     "cpy-cli": "^5.0.0",
     "cross-env": "7.0.3",
     "electron": "34.5.1",
-    "electron-mksnapshot": "34.5.1",
     "electron-builder": "26.0.13",
     "electron-link": "^0.6.0",
+    "electron-mksnapshot": "34.5.1",
     "electronmon": "^2.0.3",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
diff --git a/yarn.lock b/yarn.lock
index 80fb2d19..8e536f18 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2255,10 +2255,9 @@ at-least-node@^1.0.0:
   resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-ava@6.2.0:
+"ava@https://github.com/quine-global/ava#5b287fbd9f8c24a84f083626f72b6f177002b2a6":
   version "6.2.0"
-  resolved "https://registry.npmjs.org/ava/-/ava-6.2.0.tgz#77be81e745ae219dd835c4e0941f6cf236bb23aa"
-  integrity sha512-+GZk5PbyepjiO/68hzCZCUepQOQauKfNnI7sA4JukBTg97jD7E+tDKEA7OhGOGr6EorNNMM9+jqvgHVOTOzG4w==
+  resolved "https://github.com/quine-global/ava#5b287fbd9f8c24a84f083626f72b6f177002b2a6"
   dependencies:
     "@vercel/nft" "^0.27.5"
     acorn "^8.13.0"
@@ -3207,7 +3206,12 @@ delegates@^1.0.0:
   resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
   integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
-detect-libc@^2.0.0, detect-libc@^2.0.1:
+detect-libc@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz#f04715b8ba815e53b4d8109655b6508a6865a7e8"
+  integrity sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==
+
+detect-libc@^2.0.1:
   version "2.0.3"
   resolved "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz#f0cd503b40f9939b894697d19ad50895e30cf700"
   integrity sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==