diff --git a/justfile b/justfile
index 049de73..3d6c99f 100644
--- a/justfile
+++ b/justfile
@@ -20,6 +20,9 @@ alias phpunit := test
 test *args:
   just _exec php phpunit --colors=always {{ args }}
 
+test-watch *args:
+  nodemon --ext "*" --watch "." --exec "just test  || exit 1" --ignore */sites/simpletest
+
 drush *args:
   just _exec php drush {{ args }}
 
@@ -55,7 +58,7 @@ test-commit:
   just test --testdox --testsuite kernel
 
 _exec +args:
-  docker compose exec {{ args }}
+  docker compose exec -T {{ args }}
 
 _run service command *args:
   docker compose run \