diff --git a/Makefile b/Makefile
index 71927722a..ef66ce6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,12 @@ include ./packages/policy-engine-shared/Makefile
 include ./packages/transaction-request-intent/Makefile
 include ./packages/signature/Makefile
 
-# For more terminal color codes, head over to https://opensource.com/article/19/9/linux-terminal-colors
+# For more terminal color codes, head over to
+# https://opensource.com/article/19/9/linux-terminal-colors
 TERM_NO_COLOR := \033[0m
 TERM_GREEN := \033[0;32m
 
-# == Install ==
+# === Install ===
 
 install:
 	npm install
@@ -20,7 +21,7 @@ install:
 install/ci:
 	npm ci
 
-# == Setup ==
+# === Setup ===
 
 setup:
 	make install
@@ -32,7 +33,7 @@ setup:
 	@echo ""
 	@echo "${TERM_GREEN}Run 'make armory/start/dev' or/and 'make policy-engine/start/dev' to get them running.${TERM_NO_COLOR}"
 
-# == Docker ==
+# === Docker ===
 
 docker/stop:
 	docker-compose stop
@@ -40,7 +41,7 @@ docker/stop:
 docker/up:
 	docker-compose up --detach
 
-# == Code format ==
+# === Code format ===
 
 format:
 	npx nx format:write --all
@@ -55,3 +56,23 @@ lint:
 
 lint/check:
 	npx nx run-many --target lint
+
+# === Testing ===
+
+test/type:
+	npx nx run-many --target test:type --all
+
+test/unit:
+	npx nx run-many --target test:unit --all
+
+test/integration:
+	npx nx run-many --target test:integration --all
+
+test/e2e:
+	npx nx run-many --target test:e2e --all
+
+test:
+	make test/type
+	make test/unit
+	make test/integration
+	make test/e2e
diff --git a/apps/armory/Makefile b/apps/armory/Makefile
index f399325f7..b31cd9edd 100644
--- a/apps/armory/Makefile
+++ b/apps/armory/Makefile
@@ -113,6 +113,7 @@ armory/test/e2e/watch:
 	make armory/test/e2e ARGS=--watch
 
 armory/test:
+	make armory/test/type
 	make armory/test/unit
 	make armory/test/integration
 	make armory/test/e2e
diff --git a/apps/policy-engine/Makefile b/apps/policy-engine/Makefile
index 5a606cbae..b9a68a9b3 100644
--- a/apps/policy-engine/Makefile
+++ b/apps/policy-engine/Makefile
@@ -115,6 +115,7 @@ policy-engine/test/e2e/watch:
 	make policy-engine/test/e2e ARGS=--watch
 
 policy-engine/test:
+	make policy-engine/test/type
 	make policy-engine/test/unit
 	make policy-engine/test/integration
 	make policy-engine/test/e2e
diff --git a/apps/vault/Makefile b/apps/vault/Makefile
index 860da7d68..11e0ba105 100644
--- a/apps/vault/Makefile
+++ b/apps/vault/Makefile
@@ -115,6 +115,7 @@ vault/test/e2e/watch:
 	make vault/test/e2e ARGS=--watch
 
 vault/test:
+	make vault/test/type
 	make vault/test/unit
 	make vault/test/integration
 	make vault/test/e2e
diff --git a/packages/nestjs-shared/project.json b/packages/nestjs-shared/project.json
index ad4a398e8..8814ac275 100644
--- a/packages/nestjs-shared/project.json
+++ b/packages/nestjs-shared/project.json
@@ -11,6 +11,12 @@
         "lintFilePatterns": ["packages/nestjs-shared/**/*.ts"]
       }
     },
+    "test:type": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "make nestjs-shared/test/type"
+      }
+    },
     "test:unit": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
diff --git a/packages/policy-engine-shared/project.json b/packages/policy-engine-shared/project.json
index 50c292c95..30668a326 100644
--- a/packages/policy-engine-shared/project.json
+++ b/packages/policy-engine-shared/project.json
@@ -11,6 +11,12 @@
         "lintFilePatterns": ["packages/policy-engine-shared/**/*.ts"]
       }
     },
+    "test:type": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "make policy-engine-shared/test/type"
+      }
+    },
     "test:unit": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
diff --git a/packages/signature/project.json b/packages/signature/project.json
index e567e1ec6..9703b071c 100644
--- a/packages/signature/project.json
+++ b/packages/signature/project.json
@@ -11,6 +11,12 @@
         "lintFilePatterns": ["packages/signature/**/*.ts"]
       }
     },
+    "test:type": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "make signature/test/type"
+      }
+    },
     "test:unit": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
diff --git a/packages/transaction-request-intent/project.json b/packages/transaction-request-intent/project.json
index 0ff1fafe9..48817b229 100644
--- a/packages/transaction-request-intent/project.json
+++ b/packages/transaction-request-intent/project.json
@@ -11,6 +11,12 @@
         "lintFilePatterns": ["packages/transaction-request-intent/**/*.ts"]
       }
     },
+    "test:type": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "make transaction-request-intent/test/type"
+      }
+    },
     "test:unit": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],