diff --git a/infra/recipes/gn.expected/ci_linux.json b/infra/recipes/gn.expected/ci_linux.json
index 8fec41e..a9265a5 100644
--- a/infra/recipes/gn.expected/ci_linux.json
+++ b/infra/recipes/gn.expected/ci_linux.json
@@ -107,6 +107,13 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/gn/out/gn_unittests"
+    ],
+    "cwd": "[START_DIR]/gn",
+    "name": "test"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/recipes/gn.expected/ci_mac.json b/infra/recipes/gn.expected/ci_mac.json
index 8fec41e..a9265a5 100644
--- a/infra/recipes/gn.expected/ci_mac.json
+++ b/infra/recipes/gn.expected/ci_mac.json
@@ -107,6 +107,13 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/gn/out/gn_unittests"
+    ],
+    "cwd": "[START_DIR]/gn",
+    "name": "test"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/recipes/gn.expected/ci_win.json b/infra/recipes/gn.expected/ci_win.json
index 28b0330..0a3d7b5 100644
--- a/infra/recipes/gn.expected/ci_win.json
+++ b/infra/recipes/gn.expected/ci_win.json
@@ -107,6 +107,13 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]\\gn\\out\\gn_unittests"
+    ],
+    "cwd": "[START_DIR]\\gn",
+    "name": "test"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/recipes/gn.expected/cq_linux.json b/infra/recipes/gn.expected/cq_linux.json
index 013a468..e5dd9d4 100644
--- a/infra/recipes/gn.expected/cq_linux.json
+++ b/infra/recipes/gn.expected/cq_linux.json
@@ -134,6 +134,13 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/gn/out/gn_unittests"
+    ],
+    "cwd": "[START_DIR]/gn",
+    "name": "test"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/recipes/gn.expected/cq_mac.json b/infra/recipes/gn.expected/cq_mac.json
index 013a468..e5dd9d4 100644
--- a/infra/recipes/gn.expected/cq_mac.json
+++ b/infra/recipes/gn.expected/cq_mac.json
@@ -134,6 +134,13 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]/gn/out/gn_unittests"
+    ],
+    "cwd": "[START_DIR]/gn",
+    "name": "test"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/recipes/gn.expected/cq_win.json b/infra/recipes/gn.expected/cq_win.json
index 83394bd..70f96ab 100644
--- a/infra/recipes/gn.expected/cq_win.json
+++ b/infra/recipes/gn.expected/cq_win.json
@@ -134,6 +134,13 @@
     ]
   },
   {
+    "cmd": [
+      "[START_DIR]\\gn\\out\\gn_unittests"
+    ],
+    "cwd": "[START_DIR]\\gn",
+    "name": "test"
+  },
+  {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
diff --git a/infra/recipes/gn.py b/infra/recipes/gn.py
index d89466a..8268374 100644
--- a/infra/recipes/gn.py
+++ b/infra/recipes/gn.py
@@ -55,6 +55,9 @@
       api.step('ninja',
               ['ninja', '-C', src_dir.join('out')])
 
+  with api.context(cwd=src_dir):
+    api.step('test', [src_dir.join('out', 'gn_unittests')])
+
 
 def GenTests(api):
   for platform in ('linux', 'mac', 'win'):