diff --git a/builtin/providers/aws/resource_aws_lambda_event_source_mapping_test.go b/builtin/providers/aws/resource_aws_lambda_event_source_mapping_test.go
index 15ca56ac79f4..59fe5b56e6d0 100644
--- a/builtin/providers/aws/resource_aws_lambda_event_source_mapping_test.go
+++ b/builtin/providers/aws/resource_aws_lambda_event_source_mapping_test.go
@@ -2,6 +2,8 @@ package aws
 
 import (
 	"fmt"
+	"regexp"
+	"strconv"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -25,6 +27,23 @@ func TestAccAWSLambdaEventSourceMapping_basic(t *testing.T) {
 					testAccCheckAWSLambdaEventSourceMappingAttributes(&conf),
 				),
 			},
+			resource.TestStep{
+				Config: testAccAWSLambdaEventSourceMappingConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAwsLambdaEventSourceMappingExists("aws_lambda_event_source_mapping.lambda_event_source_mapping_test", &conf),
+					resource.TestCheckResourceAttr("aws_lambda_event_source_mapping.lambda_event_source_mapping_test",
+						"batch_size",
+						strconv.Itoa(200)),
+					resource.TestCheckResourceAttr("aws_lambda_event_source_mapping.lambda_event_source_mapping_test",
+						"enabled",
+						strconv.FormatBool(false)),
+					resource.TestMatchResourceAttr(
+						"aws_lambda_event_source_mapping.lambda_event_source_mapping_test",
+						"function_arn",
+						regexp.MustCompile("example_lambda_name_update$"),
+					),
+				),
+			},
 		},
 	})
 }
@@ -94,7 +113,7 @@ func testAccCheckAWSLambdaEventSourceMappingAttributes(mapping *lambda.EventSour
 const testAccAWSLambdaEventSourceMappingConfig = `
 resource "aws_iam_role" "iam_for_lambda" {
     name = "iam_for_lambda"
-  	assume_role_policy = <<EOF
+    assume_role_policy = <<EOF
 {
   "Version": "2012-10-17",
   "Statement": [
@@ -151,9 +170,16 @@ resource "aws_kinesis_stream" "kinesis_stream_test" {
     shard_count = 1
 }
 
-resource "aws_lambda_function" "lambda_function_test" {
+resource "aws_lambda_function" "lambda_function_test_create" {
     filename = "test-fixtures/lambdatest.zip"
-    function_name = "example_lambda_name"
+    function_name = "example_lambda_name_create"
+    role = "${aws_iam_role.iam_for_lambda.arn}"
+    handler = "exports.example"
+}
+
+resource "aws_lambda_function" "lambda_function_test_update" {
+    filename = "test-fixtures/lambdatest.zip"
+    function_name = "example_lambda_name_update"
     role = "${aws_iam_role.iam_for_lambda.arn}"
     handler = "exports.example"
 }
@@ -163,7 +189,91 @@ resource "aws_lambda_event_source_mapping" "lambda_event_source_mapping_test" {
 		event_source_arn = "${aws_kinesis_stream.kinesis_stream_test.arn}"
 		enabled = true
 		depends_on = ["aws_iam_policy_attachment.policy_attachment_for_role"]
-		function_name = "${aws_lambda_function.lambda_function_test.arn}"
+		function_name = "${aws_lambda_function.lambda_function_test_create.arn}"
+		starting_position = "TRIM_HORIZON"
+}
+`
+
+const testAccAWSLambdaEventSourceMappingConfigUpdate = `
+resource "aws_iam_role" "iam_for_lambda" {
+    name = "iam_for_lambda"
+    assume_role_policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Action": "sts:AssumeRole",
+      "Principal": {
+        "Service": "lambda.amazonaws.com"
+      },
+      "Effect": "Allow",
+      "Sid": ""
+    }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_policy" "policy_for_role" {
+    name = "policy_for_role"
+    path = "/"
+    description = "IAM policy for for Lamda event mapping testing"
+    policy = <<EOF
+{
+  "Version": "2012-10-17",
+  "Statement": [
+      {
+          "Effect": "Allow",
+          "Action": [
+            "kinesis:GetRecords",
+            "kinesis:GetShardIterator",
+            "kinesis:DescribeStream"
+          ],
+          "Resource": "*"
+      },
+      {
+          "Effect": "Allow",
+          "Action": [
+            "kinesis:ListStreams"
+          ],
+          "Resource": "*"
+      }
+  ]
+}
+EOF
+}
+
+resource "aws_iam_policy_attachment" "policy_attachment_for_role" {
+    name = "policy_attachment_for_role"
+    roles = ["${aws_iam_role.iam_for_lambda.name}"]
+    policy_arn = "${aws_iam_policy.policy_for_role.arn}"
+}
+
+resource "aws_kinesis_stream" "kinesis_stream_test" {
+    name = "kinesis_stream_test"
+    shard_count = 1
+}
+
+resource "aws_lambda_function" "lambda_function_test_create" {
+    filename = "test-fixtures/lambdatest.zip"
+    function_name = "example_lambda_name_create"
+    role = "${aws_iam_role.iam_for_lambda.arn}"
+    handler = "exports.example"
+}
+
+resource "aws_lambda_function" "lambda_function_test_update" {
+    filename = "test-fixtures/lambdatest.zip"
+    function_name = "example_lambda_name_update"
+    role = "${aws_iam_role.iam_for_lambda.arn}"
+    handler = "exports.example"
+}
+
+resource "aws_lambda_event_source_mapping" "lambda_event_source_mapping_test" {
+		batch_size = 200
+		event_source_arn = "${aws_kinesis_stream.kinesis_stream_test.arn}"
+		enabled = false
+		depends_on = ["aws_iam_policy_attachment.policy_attachment_for_role"]
+		function_name = "${aws_lambda_function.lambda_function_test_update.arn}"
 		starting_position = "TRIM_HORIZON"
 }
 `