diff --git a/builtin/providers/aws/resource_aws_redshift_parameter_group_test.go b/builtin/providers/aws/resource_aws_redshift_parameter_group_test.go
index 969cf9791..b71fbed08 100644
--- a/builtin/providers/aws/resource_aws_redshift_parameter_group_test.go
+++ b/builtin/providers/aws/resource_aws_redshift_parameter_group_test.go
@@ -137,7 +137,7 @@ func testAccCheckAWSRedshiftParameterGroupDestroy(s *terraform.State) error {
 		if !ok {
 			return err
 		}
-		if newerr.Code() != "InvalidRedshiftParameterGroup.NotFound" {
+		if newerr.Code() != "ClusterParameterGroupNotFound" {
 			return err
 		}
 	}
diff --git a/builtin/providers/aws/resource_aws_redshift_security_group_test.go b/builtin/providers/aws/resource_aws_redshift_security_group_test.go
index f663f3332..4fc3bdbe5 100644
--- a/builtin/providers/aws/resource_aws_redshift_security_group_test.go
+++ b/builtin/providers/aws/resource_aws_redshift_security_group_test.go
@@ -123,7 +123,7 @@ func testAccCheckAWSRedshiftSecurityGroupDestroy(s *terraform.State) error {
 		if !ok {
 			return err
 		}
-		if newerr.Code() != "InvalidRedshiftSecurityGroup.NotFound" {
+		if newerr.Code() != "ClusterSecurityGroupNotFound" {
 			return err
 		}
 	}
diff --git a/website/source/docs/providers/aws/r/redshift_cluster.html.markdown b/website/source/docs/providers/aws/r/redshift_cluster.html.markdown
index ec6db4bb3..ac04e6e75 100644
--- a/website/source/docs/providers/aws/r/redshift_cluster.html.markdown
+++ b/website/source/docs/providers/aws/r/redshift_cluster.html.markdown
@@ -10,6 +10,7 @@ Provides a Redshift Cluster Resource.
 
 ## Example Usage
 
+```
 resource "aws_redshift_cluster" "default" {
   cluster_identifier = "tf-redshift-cluster"
   database_name = "mydb"
@@ -18,6 +19,7 @@ resource "aws_redshift_cluster" "default" {
   node_type = "dc1.large"
   cluster_type = "single-node"
 }
+```
 
 ## Argument Reference