diff --git a/aws/resource_aws_db_instance.go b/aws/resource_aws_db_instance.go
index 945b6ff50c7..8f7005fe45c 100644
--- a/aws/resource_aws_db_instance.go
+++ b/aws/resource_aws_db_instance.go
@@ -1946,8 +1946,5 @@ func expandRestoreToPointInTime(l []interface{}) *rds.RestoreDBInstanceToPointIn
 func dbSetResourceDataEngineVersionFromInstance(d *schema.ResourceData, c *rds.DBInstance) {
 	oldVersion := d.Get("engine_version").(string)
 	newVersion := aws.StringValue(c.EngineVersion)
-	if oldVersion != newVersion && string(append([]byte(oldVersion), []byte(".")...)) != string([]byte(newVersion)[0:len(oldVersion)+1]) {
-		d.Set("engine_version", newVersion)
-	}
-	d.Set("engine_version_actual", newVersion)
+	compareActualEngineVersion(d, oldVersion, newVersion)
 }