diff --git a/.release-notes/main.md b/.release-notes/main.md
index 0ce4bb954..41e8b1fdf 100644
--- a/.release-notes/main.md
+++ b/.release-notes/main.md
@@ -33,7 +33,8 @@ Release notes for `TODO`.
 - Fixed resource templating always enabled in `patch` operation, regardless of the configured `template` field
 - Added missing operations to the `build docs` command template
 - Added test-level catch statements to the `build docs` command template
-- Added binding name validation markers
+- Added binding `name` validation markers
+- Fixed `build docs` command for files with multiple tests
 
 ## ⭐ Examples ⭐
 
diff --git a/pkg/commands/build/docs/command.go b/pkg/commands/build/docs/command.go
index e8f7c780f..ab888e9f2 100644
--- a/pkg/commands/build/docs/command.go
+++ b/pkg/commands/build/docs/command.go
@@ -44,8 +44,12 @@ func Command() *cobra.Command {
 			if err != nil {
 				return err
 			}
+			testsSet := map[string][]discovery.Test{}
+			for _, test := range tests {
+				testsSet[test.BasePath] = append(testsSet[test.BasePath], test)
+			}
 			out := cmd.OutOrStdout()
-			if err := generateDocs(out, options.readmeFile, tests...); err != nil {
+			if err := generateDocs(out, options.readmeFile, testsSet); err != nil {
 				return err
 			}
 			if options.catalog != "" {
@@ -63,20 +67,30 @@ func Command() *cobra.Command {
 	return cmd
 }
 
-func generateDocs(out io.Writer, fileName string, tests ...discovery.Test) error {
-	for _, test := range tests {
-		if test.Err == nil {
-			file, err := os.Create(filepath.Join(test.BasePath, fileName))
+func generateDocs(out io.Writer, fileName string, tests map[string][]discovery.Test) error {
+	for path, tests := range tests {
+		err := func() error {
+			var validTests []discovery.Test
+			for _, test := range tests {
+				if test.Err != nil {
+					fmt.Fprintf(out, "ERROR: failed to load test %s (%s)", test.BasePath, test.Err)
+				} else {
+					validTests = append(validTests, test)
+				}
+			}
+			file, err := os.Create(filepath.Join(path, fileName))
 			if err != nil {
 				return err
 			}
 			defer file.Close()
 			output := file
-			if err := docsTmpl.Execute(output, test); err != nil {
+			if err := docsTmpl.Execute(output, validTests); err != nil {
 				return err
 			}
-		} else {
-			fmt.Fprintf(out, "ERROR: failed to load test %s (%s)", test.BasePath, test.Err)
+			return nil
+		}()
+		if err != nil {
+			return err
 		}
 	}
 	return nil
diff --git a/pkg/commands/build/docs/docs.tmpl b/pkg/commands/build/docs/docs.tmpl
index 51bf58254..188c96b97 100644
--- a/pkg/commands/build/docs/docs.tmpl
+++ b/pkg/commands/build/docs/docs.tmpl
@@ -20,7 +20,7 @@ sleep
 {{- else if .Wait -}}
 wait
 {{- else -}}
-{{ fail (print "unknown operation " (toJson .)) }}
+{{- fail (print "unknown operation " (toJson .)) -}}
 {{- end -}}
 {{- end -}}
 
@@ -44,7 +44,7 @@ sleep
 {{- else if .Wait -}}
 wait
 {{- else -}}
-{{ fail (print "unknown catch " (toJson .)) }}
+{{- fail (print "unknown catch " (toJson .)) -}}
 {{- end -}}
 {{- end -}}
 
@@ -68,10 +68,13 @@ sleep
 {{- else if .Wait -}}
 wait
 {{- else -}}
-{{ fail (print "unknown finally " (toJson .)) }}
+{{- fail (print "unknown finally " (toJson .)) -}}
 {{- end -}}
 {{- end -}}
 
+{{- range . }}
+{{- $test := . -}}
+
 # Test: `{{ .Name }}`
 
 {{ default "*No description*" .Spec.Description }}
@@ -84,7 +87,7 @@ wait
 |:-:|---|:-:|:-:|:-:|
 {{- range $i, $step := . }}
 {{- $name := default (print "step-" (add $i 1)) $step.Name }}
-| {{ add $i 1 }} | [{{ $name }}](#step-{{ $name }}) | {{ len $step.Try }} | {{ add (len $step.Catch) (len $.Spec.Catch) }} | {{ len $step.Finally }} |
+| {{ add $i 1 }} | [{{ $name }}](#step-{{ $name }}) | {{ len $step.Try }} | {{ add (len $step.Catch) (len $test.Spec.Catch) }} | {{ len $step.Finally }} |
 {{- end }}
 {{- end }}
 
@@ -112,11 +115,11 @@ wait
 
 | # | Operation | Description |
 |:-:|---|---|
-{{- range $i, $op := $.Spec.Catch }}
+{{- range $i, $op := $test.Spec.Catch }}
 | {{ add $i 1 }} | `{{ template "CatchType" $op }}` | {{ default "*No description*" $op.Description }} |
 {{- end }}
 {{- range $i, $op := . }}
-| {{ add (len $.Spec.Catch) $i 1 }} | `{{ template "CatchType" $op }}` | {{ default "*No description*" $op.Description }} |
+| {{ add (len $test.Spec.Catch) $i 1 }} | `{{ template "CatchType" $op }}` | {{ default "*No description*" $op.Description }} |
 {{- end }}
 {{- end }}
 
@@ -132,3 +135,7 @@ wait
 {{- end }}
 
 {{- end }}
+
+---
+
+{{ end -}}
diff --git a/testdata/e2e/examples/apply-outputs/README.md b/testdata/e2e/examples/apply-outputs/README.md
index 5c0c0b118..86dc53917 100644
--- a/testdata/e2e/examples/apply-outputs/README.md
+++ b/testdata/e2e/examples/apply-outputs/README.md
@@ -4,6 +4,30 @@
 
 ### Steps
 
+| # | Name | Try | Catch | Finally |
+|:-:|---|:-:|:-:|:-:|
+| 1 | [step-1](#step-step-1) | 3 | 0 | 0 |
+
+## Step: `step-1`
+
+*No description*
+
+### Try
+
+| # | Operation | Description |
+|:-:|---|---|
+| 1 | `apply` | *No description* |
+| 2 | `script` | *No description* |
+| 3 | `assert` | *No description* |
+
+---
+
+# Test: `apply-outputs`
+
+*No description*
+
+### Steps
+
 | # | Name | Try | Catch | Finally |
 |:-:|---|:-:|:-:|:-:|
 | 1 | [step-1](#step-step-1) | 6 | 0 | 0 |
@@ -22,3 +46,6 @@
 | 4 | `script` | *No description* |
 | 5 | `assert` | *No description* |
 | 6 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/array-assertion/README.md b/testdata/e2e/examples/array-assertion/README.md
index b25880dff..4b5fe3e84 100644
--- a/testdata/e2e/examples/array-assertion/README.md
+++ b/testdata/e2e/examples/array-assertion/README.md
@@ -18,3 +18,6 @@
 |:-:|---|---|
 | 1 | `apply` | *No description* |
 | 2 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/assertion-tree/README.md b/testdata/e2e/examples/assertion-tree/README.md
index 015fb90f9..af2095d8f 100644
--- a/testdata/e2e/examples/assertion-tree/README.md
+++ b/testdata/e2e/examples/assertion-tree/README.md
@@ -17,3 +17,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/basic/README.md b/testdata/e2e/examples/basic/README.md
index 10462c229..4cd48ba33 100644
--- a/testdata/e2e/examples/basic/README.md
+++ b/testdata/e2e/examples/basic/README.md
@@ -19,3 +19,6 @@ This steps applies the configmap in the cluster and checks the configmap content
 | 1 | `apply` | Create the configmap. |
 | 2 | `assert` | Check the configmap content. |
 | 3 | `script` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/bindings/README.md b/testdata/e2e/examples/bindings/README.md
index dd2d7b6eb..8bfdf17f8 100644
--- a/testdata/e2e/examples/bindings/README.md
+++ b/testdata/e2e/examples/bindings/README.md
@@ -28,3 +28,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/catch/README.md b/testdata/e2e/examples/catch/README.md
index 55765aad9..6e1e71d30 100644
--- a/testdata/e2e/examples/catch/README.md
+++ b/testdata/e2e/examples/catch/README.md
@@ -25,3 +25,6 @@
 |:-:|---|---|
 | 1 | `events` | *No description* |
 | 2 | `describe` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/command-output/README.md b/testdata/e2e/examples/command-output/README.md
index 2c4e78de4..fc5f89e4c 100644
--- a/testdata/e2e/examples/command-output/README.md
+++ b/testdata/e2e/examples/command-output/README.md
@@ -17,3 +17,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `script` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/delete/README.md b/testdata/e2e/examples/delete/README.md
index 3df54ccfb..8f5979990 100644
--- a/testdata/e2e/examples/delete/README.md
+++ b/testdata/e2e/examples/delete/README.md
@@ -18,3 +18,6 @@
 |:-:|---|---|
 | 1 | `apply` | *No description* |
 | 2 | `delete` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/deployment/README.md b/testdata/e2e/examples/deployment/README.md
index 3436f462e..2e1e8b564 100644
--- a/testdata/e2e/examples/deployment/README.md
+++ b/testdata/e2e/examples/deployment/README.md
@@ -18,3 +18,6 @@
 |:-:|---|---|
 | 1 | `apply` | *No description* |
 | 2 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/finally/README.md b/testdata/e2e/examples/finally/README.md
index 0261d9914..6f0379075 100644
--- a/testdata/e2e/examples/finally/README.md
+++ b/testdata/e2e/examples/finally/README.md
@@ -25,3 +25,6 @@
 |:-:|---|---|
 | 1 | `events` | *No description* |
 | 2 | `script` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/inline/README.md b/testdata/e2e/examples/inline/README.md
index 9e9e80c6e..6e2a28247 100644
--- a/testdata/e2e/examples/inline/README.md
+++ b/testdata/e2e/examples/inline/README.md
@@ -18,3 +18,6 @@
 |:-:|---|---|
 | 1 | `apply` | *No description* |
 | 2 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/k8s-server-version/README.md b/testdata/e2e/examples/k8s-server-version/README.md
index 13ddff5e4..1b4b5b87d 100644
--- a/testdata/e2e/examples/k8s-server-version/README.md
+++ b/testdata/e2e/examples/k8s-server-version/README.md
@@ -17,3 +17,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `script` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/list/README.md b/testdata/e2e/examples/list/README.md
index 323b46029..7490487bf 100644
--- a/testdata/e2e/examples/list/README.md
+++ b/testdata/e2e/examples/list/README.md
@@ -19,3 +19,6 @@
 | 1 | `apply` | *No description* |
 | 2 | `assert` | *No description* |
 | 3 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/namespace-template/README.md b/testdata/e2e/examples/namespace-template/README.md
index ae131a55b..b866b5f94 100644
--- a/testdata/e2e/examples/namespace-template/README.md
+++ b/testdata/e2e/examples/namespace-template/README.md
@@ -17,3 +17,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/non-resource-assertion/README.md b/testdata/e2e/examples/non-resource-assertion/README.md
index 629e9e131..f22c62839 100644
--- a/testdata/e2e/examples/non-resource-assertion/README.md
+++ b/testdata/e2e/examples/non-resource-assertion/README.md
@@ -30,3 +30,6 @@
 |:-:|---|---|
 | 1 | `assert` | *No description* |
 | 2 | `error` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/outputs/README.md b/testdata/e2e/examples/outputs/README.md
index 8346a8070..623b5dfab 100644
--- a/testdata/e2e/examples/outputs/README.md
+++ b/testdata/e2e/examples/outputs/README.md
@@ -41,3 +41,6 @@
 |:-:|---|---|
 | 1 | `command` | *No description* |
 | 2 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/patch/README.md b/testdata/e2e/examples/patch/README.md
index f1d12a39d..253e8dea7 100644
--- a/testdata/e2e/examples/patch/README.md
+++ b/testdata/e2e/examples/patch/README.md
@@ -19,3 +19,6 @@
 | 1 | `apply` | *No description* |
 | 2 | `patch` | *No description* |
 | 3 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/script-env/README.md b/testdata/e2e/examples/script-env/README.md
index 98c304dc2..18af228f0 100644
--- a/testdata/e2e/examples/script-env/README.md
+++ b/testdata/e2e/examples/script-env/README.md
@@ -18,3 +18,6 @@
 |:-:|---|---|
 | 1 | `script` | *No description* |
 | 2 | `command` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/sleep/README.md b/testdata/e2e/examples/sleep/README.md
index 63e306977..92820dea2 100644
--- a/testdata/e2e/examples/sleep/README.md
+++ b/testdata/e2e/examples/sleep/README.md
@@ -29,3 +29,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `sleep` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/template/README.md b/testdata/e2e/examples/template/README.md
index 931bca992..447821a55 100644
--- a/testdata/e2e/examples/template/README.md
+++ b/testdata/e2e/examples/template/README.md
@@ -19,3 +19,6 @@
 | 1 | `apply` | *No description* |
 | 2 | `assert` | *No description* |
 | 3 | `delete` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/timeout/README.md b/testdata/e2e/examples/timeout/README.md
index 4e50f0ec3..34b8bb00e 100644
--- a/testdata/e2e/examples/timeout/README.md
+++ b/testdata/e2e/examples/timeout/README.md
@@ -17,3 +17,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `script` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/values/README.md b/testdata/e2e/examples/values/README.md
index 56c5c5893..dcef64c41 100644
--- a/testdata/e2e/examples/values/README.md
+++ b/testdata/e2e/examples/values/README.md
@@ -17,3 +17,6 @@
 | # | Operation | Description |
 |:-:|---|---|
 | 1 | `assert` | *No description* |
+
+---
+
diff --git a/testdata/e2e/examples/wait/README.md b/testdata/e2e/examples/wait/README.md
index 58aabb22b..5ab4edab5 100644
--- a/testdata/e2e/examples/wait/README.md
+++ b/testdata/e2e/examples/wait/README.md
@@ -36,3 +36,6 @@
 |:-:|---|---|
 | 1 | `delete` | *No description* |
 | 2 | `wait` | *No description* |
+
+---
+