diff --git a/package.json b/package.json
index 1458ba7..f776027 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
     "db:migrate:rollback": "knex migrate:rollback",
     "db:seed": "knex seed:run",
     "start": "npm run build && node dist/index.js",
-    "test": "mocha -r ts-node/register 'test/**/*.spec.ts'"
+    "test": "mocha -r ts-node/register 'test/**/*.spec.ts'",
+    "test:watch": "npm run test -- --min --watch --watch-files src/**/*,test/**/*"
   },
   "repository": {
     "type": "git",
diff --git a/tsconfig.json b/tsconfig.json
index ed0c678..7f1c881 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,7 +8,6 @@
     "allowSyntheticDefaultImports": true,
     "target": "es6",
     "outDir": "./dist",
-    "baseUrl": "./src",
     "moduleResolution": "Node",
     "types": ["node", "mocha"],
     "typeRoots": ["./node_modules/@types"],
@@ -23,6 +22,11 @@
   "ts-node": {
     "transpileOnly": true
   },
-  "include": ["src"],
-  "exclude": ["node_modules", "test"]
+  "include": [
+    "src/**/*.ts",
+    "test/**/*.ts"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }