diff --git a/builtin/providers/aws/resource_aws_route53_zone_test.go b/builtin/providers/aws/resource_aws_route53_zone_test.go
index d6e4af2f2..0669f88b1 100644
--- a/builtin/providers/aws/resource_aws_route53_zone_test.go
+++ b/builtin/providers/aws/resource_aws_route53_zone_test.go
@@ -134,13 +134,10 @@ func testAccLoadTagsR53(zone *route53.HostedZone, td *route53.ResourceTagSet) re
 			return err
 		}
 
-		var tags []route53.Tag
 		if resp.ResourceTagSet != nil {
-			tags = resp.ResourceTagSet.Tags
+			*td = *resp.ResourceTagSet
 		}
 
-		*td = *resp.ResourceTagSet
-
 		return nil
 	}
 }
diff --git a/builtin/providers/aws/tags_route53.go b/builtin/providers/aws/tags_route53.go
index 8e31fc373..e5251d02a 100644
--- a/builtin/providers/aws/tags_route53.go
+++ b/builtin/providers/aws/tags_route53.go
@@ -29,7 +29,8 @@ func setTagsR53(conn *route53.Route53, d *schema.ResourceData) error {
 			ResourceID:    aws.String(d.Id()),
 			ResourceType:  aws.String("hostedzone"),
 		}
-		resp, err := conn.ChangeTagsForResource(req)
+
+		_, err := conn.ChangeTagsForResource(req)
 		if err != nil {
 			return err
 		}