diff --git a/packages/browser/package.json b/packages/browser/package.json
index 56e6a5a08..ad7617767 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -56,8 +56,8 @@
   "scripts": {
     "build": "yarn build:cjs && yarn build:esm && yarn build:umd",
     "build:watch": "concurrently 'yarn build:cjs:watch' 'yarn build:esm:watch'",
-    "build:cjs": "tsc -p tsconfig.json",
-    "build:cjs:watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "build:umd": "rollup --config",
diff --git a/packages/browser/tsconfig.cjs.json b/packages/browser/tsconfig.cjs.json
new file mode 100644
index 000000000..039e0b4d1
--- /dev/null
+++ b/packages/browser/tsconfig.cjs.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src"]
+}
diff --git a/packages/browser/tsconfig.esm.json b/packages/browser/tsconfig.esm.json
index b6f57def9..15b462b32 100644
--- a/packages/browser/tsconfig.esm.json
+++ b/packages/browser/tsconfig.esm.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.esm.json",
   "compilerOptions": {
-    "module": "ES6",
     "outDir": "esm"
-  }
+  },
+  "include": ["src"]
 }
diff --git a/packages/browser/tsconfig.json b/packages/browser/tsconfig.json
index 4814b998d..5dea45df8 100644
--- a/packages/browser/tsconfig.json
+++ b/packages/browser/tsconfig.json
@@ -1,7 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "./tsconfig.cjs.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src",
-  }
+    "rootDir": ".",
+  },
+  "include": ["src", "test"]
 }
diff --git a/packages/node/package.json b/packages/node/package.json
index 4cb0de754..133a88685 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -45,8 +45,8 @@
   "scripts": {
     "build": "yarn build:cjs && yarn build:esm",
     "build:watch": "concurrently 'yarn build:cjs:watch' 'yarn build:esm:watch'",
-    "build:cjs": "tsc -p tsconfig.json",
-    "build:cjs:watch": "tsc -p tsconfig.json -w --preserveWatchOutput",
+    "build:cjs": "tsc -p tsconfig.cjs.json",
+    "build:cjs:watch": "tsc -p tsconfig.cjs.json -w --preserveWatchOutput",
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:esm:watch": "tsc -p tsconfig.esm.json -w --preserveWatchOutput",
     "clean": "rm -rf dist esm",
diff --git a/packages/node/tsconfig.cjs.json b/packages/node/tsconfig.cjs.json
new file mode 100644
index 000000000..039e0b4d1
--- /dev/null
+++ b/packages/node/tsconfig.cjs.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src"]
+}
diff --git a/packages/node/tsconfig.esm.json b/packages/node/tsconfig.esm.json
index b6f57def9..15b462b32 100644
--- a/packages/node/tsconfig.esm.json
+++ b/packages/node/tsconfig.esm.json
@@ -1,7 +1,7 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "../../tsconfig.esm.json",
   "compilerOptions": {
-    "module": "ES6",
     "outDir": "esm"
-  }
+  },
+  "include": ["src"]
 }
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
index 4814b998d..5dea45df8 100644
--- a/packages/node/tsconfig.json
+++ b/packages/node/tsconfig.json
@@ -1,7 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "./tsconfig.cjs.json",
   "compilerOptions": {
-    "outDir": "dist",
-    "rootDir": "src",
-  }
+    "rootDir": ".",
+  },
+  "include": ["src", "test"]
 }
diff --git a/tsconfig.esm.json b/tsconfig.esm.json
new file mode 100644
index 000000000..a24c662db
--- /dev/null
+++ b/tsconfig.esm.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "ES6"
+  }
+}
diff --git a/tsconfig.json b/tsconfig.json
index e7f3cc0bd..fd67108e0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,6 @@
     "preserveConstEnums": true,
     "skipLibCheck": true,
     "sourceMap": true,
-    "target": "ES5",
-    "types": ["node", "jest"]
+    "target": "ES5"
   }
 }