diff --git a/helper/resource/testing.go b/helper/resource/testing.go
index d153f93dc6..e1156422eb 100644
--- a/helper/resource/testing.go
+++ b/helper/resource/testing.go
@@ -235,8 +235,8 @@ func testStep(
 
 	// Check! Excitement!
 	if step.Check != nil {
-		if err = step.Check(state); err != nil {
-			err = fmt.Errorf("Check failed: %s", err)
+		if err := step.Check(state); err != nil {
+			return state, fmt.Errorf("Check failed: %s", err)
 		}
 	}