diff --git a/terraform/context.go b/terraform/context.go
index 06eef4300c..3c4e4b62ed 100644
--- a/terraform/context.go
+++ b/terraform/context.go
@@ -665,6 +665,12 @@ func (c *Context) Validate() ([]string, []error) {
 
 	// Return the result
 	rerrs := multierror.Append(errs, walker.ValidationErrors...)
+
+	sort.Strings(walker.ValidationWarnings)
+	sort.Slice(rerrs.Errors, func(i, j int) bool {
+		return rerrs.Errors[i].Error() < rerrs.Errors[j].Error()
+	})
+
 	return walker.ValidationWarnings, rerrs.Errors
 }