4 files changed, 112 insertions, 0 deletions
diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs
index 04465dd53..030da05e1 100644
--- a/cli/tests/integration/test_tests.rs
+++ b/cli/tests/integration/test_tests.rs
@@ -356,6 +356,25 @@ itest!(steps_dot_ignored_steps {
   output: "test/steps/ignored_steps.dot.out",
 });
 
+itest!(steps_tap_passing_steps {
+  args: "test --reporter=tap test/steps/passing_steps.ts",
+  exit_code: 0,
+  output: "test/steps/passing_steps.tap.out",
+});
+
+itest!(steps_tap_failing_steps {
+  args: "test --reporter=tap test/steps/failing_steps.ts",
+  exit_code: 1,
+  envs: vec![("NO_COLOR".to_owned(), "1".to_owned())],
+  output: "test/steps/failing_steps.tap.out",
+});
+
+itest!(steps_tap_ignored_steps {
+  args: "test --reporter=tap test/steps/ignored_steps.ts",
+  exit_code: 0,
+  output: "test/steps/ignored_steps.tap.out",
+});
+
 itest!(steps_invalid_usage {
   args: "test test/steps/invalid_usage.ts",
   exit_code: 1,
diff --git a/cli/tests/testdata/test/steps/failing_steps.tap.out b/cli/tests/testdata/test/steps/failing_steps.tap.out
new file mode 100644
index 000000000..11b289f08
--- /dev/null
+++ b/cli/tests/testdata/test/steps/failing_steps.tap.out
@@ -0,0 +1,43 @@
+TAP version 14
+# ./test/steps/failing_steps.ts
+# Subtest: nested failure
+    not ok 1 - inner 1
+      ---
+      {"message":"Error: Failed.\n      throw new Error(\"Failed.\");\n            ^\n    at [WILDCARD]/failing_steps.ts:[WILDCARD]\n[WILDCARD]","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+      ...
+    ok 2 - inner 2
+    not ok 3 - step 1
+      ---
+      {"message":"1 test step failed.","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+      ...
+    1..3
+not ok 1 - nested failure
+  ---
+  {"message":"1 test step failed.","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+  ...
+# Subtest: multiple test step failures
+    not ok 1 - step 1
+      ---
+      {"message":"Error: Fail.\n    throw new Error(\"Fail.\");\n          ^\n    at [WILDCARD]/failing_steps.ts:[WILDCARD]\n[WILDCARD]","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+      ...
+    not ok 2 - step 2
+      ---
+      {"message":"Error: Fail.\n  await t.step(\"step 2\", () => Promise.reject(new Error(\"Fail.\")));\n                                              ^\n    at [WILDCARD]/failing_steps.ts:[WILDCARD]\n[WILDCARD]","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+      ...
+    1..2
+not ok 2 - multiple test step failures
+  ---
+  {"message":"2 test steps failed.","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+  ...
+# Subtest: failing step in failing test
+    not ok 1 - step 1
+      ---
+      {"message":"Error: Fail.\n    throw new Error(\"Fail.\");\n          ^\n    at [WILDCARD]/failing_steps.ts:[WILDCARD]\n[WILDCARD]","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+      ...
+    1..1
+not ok 3 - failing step in failing test
+  ---
+  {"message":"Error: Fail test.\n  throw new Error(\"Fail test.\");\n        ^\n    at [WILDCARD]/failing_steps.ts:[WILDCARD]","severity":"fail","at":{"file":"./test/steps/failing_steps.ts","line":[WILDCARD]}}
+  ...
+1..3
+error: Test failed
diff --git a/cli/tests/testdata/test/steps/ignored_steps.tap.out b/cli/tests/testdata/test/steps/ignored_steps.tap.out
new file mode 100644
index 000000000..b2b2f5070
--- /dev/null
+++ b/cli/tests/testdata/test/steps/ignored_steps.tap.out
@@ -0,0 +1,8 @@
+TAP version 14
+# ./test/steps/ignored_steps.ts
+# Subtest: ignored step
+    ok 1 - step 1 # SKIP
+    ok 2 - step 2
+    1..2
+ok 1 - ignored step
+1..1
diff --git a/cli/tests/testdata/test/steps/passing_steps.tap.out b/cli/tests/testdata/test/steps/passing_steps.tap.out
new file mode 100644
index 000000000..20a9fa312
--- /dev/null
+++ b/cli/tests/testdata/test/steps/passing_steps.tap.out
@@ -0,0 +1,42 @@
+TAP version 14
+# ./test/steps/passing_steps.ts
+# Subtest: description
+    ok 1 - inner 1
+    ok 2 - inner 2
+    ok 3 - step 1
+    1..3
+ok 1 - description
+# Subtest: description function as first arg
+    ok 1 - inner1
+    ok 2 - inner1
+    ok 3 - step1
+    1..3
+ok 2 - description function as first arg
+# Subtest: parallel steps without sanitizers
+    ok 1 - step 1
+    ok 2 - step 2
+    1..2
+ok 3 - parallel steps without sanitizers
+# Subtest: parallel steps without sanitizers due to parent
+    ok 1 - step 1
+    ok 2 - step 2
+    1..2
+ok 4 - parallel steps without sanitizers due to parent
+# Subtest: steps with disabled sanitizers, then enabled, then parallel disabled
+    ok 1 - step 2
+    ok 2 - step 1
+    ok 3 - step 1
+    ok 4 - step 1
+    ok 5 - step 1
+    ok 6 - step 1
+    1..6
+ok 5 - steps with disabled sanitizers, then enabled, then parallel disabled
+# Subtest: steps buffered then streaming reporting
+    ok 1 - step 1 - 2 - 1
+    ok 2 - step 1 - 2
+    ok 3 - step 1 - 1
+    ok 4 - step 1
+    ok 5 - step 2
+    1..5
+ok 6 - steps buffered then streaming reporting
+1..6