diff --git a/terraform/context_plan_test.go b/terraform/context_plan_test.go
index 09ed1bd82..2bccc40e5 100644
--- a/terraform/context_plan_test.go
+++ b/terraform/context_plan_test.go
@@ -2365,3 +2365,30 @@ func TestContext2Plan_computedValueInMap(t *testing.T) {
 		t.Fatalf("bad:\n%s\n\nexpected\n\n%s", actual, expected)
 	}
 }
+
+func TestContext2Plan_moduleVariableFromSplat(t *testing.T) {
+	m := testModule(t, "plan-module-variable-from-splat")
+	p := testProvider("aws")
+	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)
+	}
+
+	plan, err := ctx.Plan()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(plan.String())
+	expected := strings.TrimSpace(testTerraformPlanModuleVariableFromSplat)
+	if actual != expected {
+		t.Fatalf("bad:\n%s\n\nexpected\n\n%s", actual, expected)
+	}
+}
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 333e72767..6be32ea03 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -1371,3 +1371,25 @@ STATE:
 
 <no state>
 `
+
+const testTerraformPlanModuleVariableFromSplat = `
+DIFF:
+
+module.mod1:
+  CREATE: aws_instance.test.0
+    thing: "" => "doesnt"
+    type:  "" => "aws_instance"
+  CREATE: aws_instance.test.1
+    thing: "" => "doesnt"
+    type:  "" => "aws_instance"
+module.mod2:
+  CREATE: aws_instance.test.0
+    thing: "" => "doesnt"
+    type:  "" => "aws_instance"
+  CREATE: aws_instance.test.1
+    thing: "" => "doesnt"
+    type:  "" => "aws_instance"
+
+STATE:
+
+<no state>`
diff --git a/terraform/test-fixtures/plan-module-variable-from-splat/main.tf b/terraform/test-fixtures/plan-module-variable-from-splat/main.tf
new file mode 100644
index 000000000..2af78acd5
--- /dev/null
+++ b/terraform/test-fixtures/plan-module-variable-from-splat/main.tf
@@ -0,0 +1,9 @@
+module "mod1" {
+  source = "mod"
+  param  = ["this", "one", "works"]
+}
+
+module "mod2" {
+  source = "mod"
+  param  = ["${module.mod1.out_from_splat[0]}"]
+}
diff --git a/terraform/test-fixtures/plan-module-variable-from-splat/mod/main.tf b/terraform/test-fixtures/plan-module-variable-from-splat/mod/main.tf
new file mode 100644
index 000000000..28d9175d2
--- /dev/null
+++ b/terraform/test-fixtures/plan-module-variable-from-splat/mod/main.tf
@@ -0,0 +1,12 @@
+variable "param" {
+  type = "list"
+}
+
+resource "aws_instance" "test" {
+  count    = "2"
+  thing = "doesnt"
+}
+
+output "out_from_splat" {
+  value = ["${aws_instance.test.*.thing}"]
+}