@@ -316,9 +316,9 @@ func testStep(
 // into smaller pieces more easily.
 func ComposeTestCheckFunc(fs ...TestCheckFunc) TestCheckFunc {
 	return func(s *terraform.State) error {
-		for _, f := range fs {
+		for i, f := range fs {
 			if err := f(s); err != nil {
-				return err
+				return fmt.Errorf("Check %d/%d error: %s", i+1, len(fs), err)
 			}
 		}
 
 
@@ -194,7 +194,7 @@ func TestComposeTestCheckFunc(t *testing.T) {
 				},
 				func(*terraform.State) error { return nil },
 			},
-			Result: "error",
+			Result: "Check 1/2 error: error",
 		},
 
 		{
@@ -204,7 +204,7 @@ func TestComposeTestCheckFunc(t *testing.T) {
 					return fmt.Errorf("error")
 				},
 			},
-			Result: "error",
+			Result: "Check 2/2 error: error",
 		},
 
 		{
Original file line number	Diff line number	Diff line change
`@@ -316,9 +316,9 @@ func testStep(`
`316`	`316`	`// into smaller pieces more easily.`
`317`	`317`	`func ComposeTestCheckFunc(fs ...TestCheckFunc) TestCheckFunc {`
`318`	`318`	`return func(s *terraform.State) error {`
`319`		`- for _, f := range fs {`
	`319`	`+ for i, f := range fs {`
`320`	`320`	`if err := f(s); err != nil {`
`321`		`- return err`
	`321`	`+ return fmt.Errorf("Check %d/%d error: %s", i+1, len(fs), err)`
`322`	`322`	`}`
`323`	`323`	`}`
`324`	`324`