diff --git a/README.md b/README.md
index 042f458..59ad638 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ npm run test
 ```
 
 Test files are alongside source files under `src/` and named `*.test.ts?`.
-Whenever you add, remove, or rename a `*.test.ts?` file under `src/`, re-run `npm run test:setup` to regenerate the list of static test files in `test/index.html`.
+Whenever you add, remove, or rename a `*.test.t*` file under `src/`, `watch` will re-run `npm run test:setup` to regenerate the list of static test files in `test/index.html`.
 You can open that file in a browser to debug through the tests.
-`npm run test` will run that setup and execute tests using [Puppeteer](https://github.com/GoogleChrome/puppeteer).
+`npm run test:run` will run that setup and execute tests using [Puppeteer](https://github.com/GoogleChrome/puppeteer).
 <!-- {{/Development}} -->
diff --git a/package.json b/package.json
index a4ca78d..23e600d 100644
--- a/package.json
+++ b/package.json
@@ -11,26 +11,28 @@
   },
   "description": "A path-based cache for quick lookups in nested data structures.",
   "devDependencies": {
-    "@types/chai": "^4.0.4",
+    "@types/chai": "^4.1.1",
     "@types/lolex": "^2.1.1",
     "@types/mocha": "^2.2.46",
     "@types/sinon": "^4.1.3",
     "@types/sinon-chai": "^2.7.29",
     "chai": "^4.1.2",
+    "concurrently": "^3.5.1",
     "glob": "^7.1.2",
-    "lolex": "^2.3.0",
+    "lolex": "^2.3.1",
     "mkdirp": "^0.5.1",
     "mocha": "^5.0.0",
-    "mocha-headless-chrome": "^1.8.1",
+    "mocha-headless-chrome": "^1.8.2",
     "requirejs": "^2.3.5",
     "run-for-every-file": "^1.1.0",
-    "shenanigans-manager": "^0.2.20",
-    "sinon": "^4.1.5",
+    "shenanigans-manager": "^0.2.22",
+    "sinon": "^4.2.0",
     "sinon-chai": "^2.14.0",
     "tslint": "5.9.1",
-    "tsutils": "^2.17.0",
+    "tsutils": "^2.19.1",
     "typedoc": "^0.9.0",
     "typescript": "^2.6.2",
+    "watch": "^1.0.2",
     "webpack": "^3.10.0"
   },
   "license": "MIT",
@@ -62,7 +64,7 @@
     "test:setup:html": "shenanigans-manager generate-test-html",
     "test:setup:tsc": "tsc -p test",
     "verify": "npm run src && npm run test && npm run dist && npm run docs",
-    "watch": "tsc -p . -w"
+    "watch": "concurrently \"tsc -p . -w\" --raw \"chokidar src/**/*.test.t* --command \"\"npm run test:setup:html\"\" --silent\" --raw"
   },
   "shenanigans": {
     "name": "StringFilr"