diff --git a/builtin/providers/aws/resource_aws_kinesis_firehose_stream.go b/builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream.go
similarity index 100%
rename from builtin/providers/aws/resource_aws_kinesis_firehose_stream.go
rename to builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream.go
diff --git a/builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream_test.go b/builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream_test.go
new file mode 100644
index 000000000..1414f7ae6
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_kinesis_firehose_delivery_stream_test.go
@@ -0,0 +1,106 @@
+package aws
+
+import (
+	"fmt"
+	"math/rand"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/firehose"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSKinesisFirehoseDeliveryStream_basic(t *testing.T) {
+	var stream firehose.DeliveryStreamDescription
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckKinesisFirehoseDeliveryStreamDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccKinesisFirehoseDeliveryStreamConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckKinesisFirehoseDeliveryStreamExists("aws_kinesis_firehose_delivery_stream.test_stream", &stream),
+					testAccCheckAWSKinesisFirehoseDeliveryStreamAttributes(&stream),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckKinesisFirehoseDeliveryStreamExists(n string, stream *firehose.DeliveryStreamDescription) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No Kinesis Firehose ID is set")
+		}
+
+		conn := testAccProvider.Meta().(*AWSClient).firehoseconn
+		describeOpts := &firehose.DescribeDeliveryStreamInput{
+			DeliveryStreamName: aws.String(rs.Primary.Attributes["name"]),
+		}
+		resp, err := conn.DescribeDeliveryStream(describeOpts)
+		if err != nil {
+			return err
+		}
+
+		*stream = *resp.DeliveryStreamDescription
+
+		return nil
+	}
+}
+
+func testAccCheckAWSKinesisFirehoseDeliveryStreamAttributes(stream *firehose.DeliveryStreamDescription) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		if !strings.HasPrefix(*stream.DeliveryStreamName, "terraform-kinesis-firehose-test") {
+			return fmt.Errorf("Bad Stream name: %s", *stream.DeliveryStreamName)
+		}
+		for _, rs := range s.RootModule().Resources {
+			if rs.Type != "aws_kinesis_firehose_delivery_stream" {
+				continue
+			}
+			if *stream.DeliveryStreamARN != rs.Primary.Attributes["arn"] {
+				return fmt.Errorf("Bad Delivery Stream ARN\n\t expected: %s\n\tgot: %s\n", rs.Primary.Attributes["arn"], *stream.DeliveryStreamARN)
+			}
+		}
+		return nil
+	}
+}
+
+func testAccCheckKinesisFirehoseDeliveryStreamDestroy(s *terraform.State) error {
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_kinesis_firehose_delivery_stream" {
+			continue
+		}
+		conn := testAccProvider.Meta().(*AWSClient).firehoseconn
+		describeOpts := &firehose.DescribeDeliveryStreamInput{
+			DeliveryStreamName: aws.String(rs.Primary.Attributes["name"]),
+		}
+		resp, err := conn.DescribeDeliveryStream(describeOpts)
+		if err == nil {
+			if resp.DeliveryStreamDescription != nil && *resp.DeliveryStreamDescription.DeliveryStreamStatus != "DELETING" {
+				return fmt.Errorf("Error: Delivery Stream still exists")
+			}
+		}
+
+		return nil
+
+	}
+
+	return nil
+}
+
+var testAccKinesisFirehoseDeliveryStreamConfig = fmt.Sprintf(`
+resource "aws_kinesis_firehose_delivery_stream" "test_stream" {
+	name = "terraform-kinesis-firehose-test-%d"
+
+}
+`, rand.New(rand.NewSource(time.Now().UnixNano())).Int())