diff --git a/command/validate_test.go b/command/validate_test.go
index 1cb5ff750..2684186ab 100644
--- a/command/validate_test.go
+++ b/command/validate_test.go
@@ -148,11 +148,11 @@ func TestOutputWithoutValueShouldFail(t *testing.T) {
 	if code != 1 {
 		t.Fatalf("Should have failed: %d\n\n%s", code, ui.ErrorWriter.String())
 	}
-	wantError := `The attribute "value" is required, but no definition was found.`
+	wantError := `The argument "value" is required, but no definition was found.`
 	if !strings.Contains(ui.ErrorWriter.String(), wantError) {
 		t.Fatalf("Missing error string %q\n\n'%s'", wantError, ui.ErrorWriter.String())
 	}
-	wantError = `An attribute named "values" is not expected here. Did you mean "value"?`
+	wantError = `An argument named "values" is not expected here. Did you mean "value"?`
 	if !strings.Contains(ui.ErrorWriter.String(), wantError) {
 		t.Fatalf("Missing error string %q\n\n'%s'", wantError, ui.ErrorWriter.String())
 	}
diff --git a/configs/parser_config_test.go b/configs/parser_config_test.go
index 09ea72659..9f0e79bbd 100644
--- a/configs/parser_config_test.go
+++ b/configs/parser_config_test.go
@@ -102,7 +102,7 @@ func TestParserLoadConfigFileFailureMessages(t *testing.T) {
 		{
 			"invalid-files/unexpected-attr.tf",
 			hcl.DiagError,
-			"Unsupported attribute",
+			"Unsupported argument",
 		},
 		{
 			"invalid-files/unexpected-block.tf",