diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 1d7c15f92..c9e09bedc 100644
--- a/terraform/context_apply_test.go
+++ b/terraform/context_apply_test.go
@@ -1156,6 +1156,34 @@ func TestContext2Apply_countVariable(t *testing.T) {
 	}
 }
 
+func TestContext2Apply_countVariableRef(t *testing.T) {
+	m := testModule(t, "apply-count-variable-ref")
+	p := testProvider("aws")
+	p.ApplyFn = testApplyFn
+	p.DiffFn = testDiffFn
+	ctx := testContext2(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+	})
+
+	if _, err := ctx.Plan(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	state, err := ctx.Apply()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(state.String())
+	expected := strings.TrimSpace(testTerraformApplyCountVariableRefStr)
+	if actual != expected {
+		t.Fatalf("bad: \n%s", actual)
+	}
+}
+
 func TestContext2Apply_mapVariableOverride(t *testing.T) {
 	m := testModule(t, "apply-map-var-override")
 	p := testProvider("aws")
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 4208eedec..f8244ce00 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -386,6 +386,20 @@ aws_instance.foo.1:
   type = aws_instance
 `
 
+const testTerraformApplyCountVariableRefStr = `
+aws_instance.bar:
+  ID = foo
+  foo = 2
+  type = aws_instance
+
+  Dependencies:
+    aws_instance.foo
+aws_instance.foo.0:
+  ID = foo
+aws_instance.foo.1:
+  ID = foo
+`
+
 const testTerraformApplyMinimalStr = `
 aws_instance.bar:
   ID = foo
diff --git a/terraform/test-fixtures/apply-count-variable-ref/main.tf b/terraform/test-fixtures/apply-count-variable-ref/main.tf
new file mode 100644
index 000000000..52c70d90d
--- /dev/null
+++ b/terraform/test-fixtures/apply-count-variable-ref/main.tf
@@ -0,0 +1,11 @@
+variable "foo" {
+    default = "2"
+}
+
+resource "aws_instance" "foo" {
+    count = "${var.foo}"
+}
+
+resource "aws_instance" "bar" {
+    foo = "${aws_instance.foo.count}"
+}