diff --git a/terraform/context_test.go b/terraform/context_test.go
index 22a580ca2..dded2d987 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -2487,6 +2487,29 @@ func TestContextPlan_countIndex(t *testing.T) {
 	}
 }
 
+func TestContextPlan_countIndexZero(t *testing.T) {
+	m := testModule(t, "plan-count-index-zero")
+	p := testProvider("aws")
+	p.DiffFn = testDiffFn
+	ctx := testContext(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+	})
+
+	plan, err := ctx.Plan(nil)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(plan.String())
+	expected := strings.TrimSpace(testTerraformPlanCountIndexZeroStr)
+	if actual != expected {
+		t.Fatalf("bad:\n%s", actual)
+	}
+}
+
 func TestContextPlan_countVar(t *testing.T) {
 	m := testModule(t, "plan-count-var")
 	p := testProvider("aws")
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index eb70418d5..c0ac52537 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -492,6 +492,18 @@ STATE:
 <no state>
 `
 
+const testTerraformPlanCountIndexZeroStr = `
+DIFF:
+
+CREATE: aws_instance.foo
+  foo:  "" => "0"
+  type: "" => "aws_instance"
+
+STATE:
+
+<no state>
+`
+
 const testTerraformPlanCountOneIndexStr = `
 DIFF:
 
diff --git a/terraform/test-fixtures/plan-count-index-zero/main.tf b/terraform/test-fixtures/plan-count-index-zero/main.tf
new file mode 100644
index 000000000..c189c7d1a
--- /dev/null
+++ b/terraform/test-fixtures/plan-count-index-zero/main.tf
@@ -0,0 +1,3 @@
+resource "aws_instance" "foo" {
+    foo = "${count.index}"
+}