diff --git a/terraform/context_test.go b/terraform/context_test.go
index f3b8cd6ef..be78ef79b 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -3782,6 +3782,36 @@ func TestContextPlan_multiple_taint(t *testing.T) {
 	}
 }
 
+func TestContextPlan_provider(t *testing.T) {
+	m := testModule(t, "plan-provider")
+	p := testProvider("aws")
+	p.DiffFn = testDiffFn
+
+	var value interface{}
+	p.ConfigureFn = func(c *ResourceConfig) error {
+		value, _ = c.Get("foo")
+		return nil
+	}
+
+	ctx := testContext(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+		Variables: map[string]string{
+			"foo": "bar",
+		},
+	})
+
+	if _, err := ctx.Plan(nil); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if value != "bar" {
+		t.Fatalf("bad: %#v", value)
+	}
+}
+
 func TestContextPlan_varMultiCountOne(t *testing.T) {
 	m := testModule(t, "plan-var-multi-count-one")
 	p := testProvider("aws")
diff --git a/terraform/test-fixtures/plan-provider/main.tf b/terraform/test-fixtures/plan-provider/main.tf
new file mode 100644
index 000000000..8010f70ae
--- /dev/null
+++ b/terraform/test-fixtures/plan-provider/main.tf
@@ -0,0 +1,7 @@
+variable "foo" {}
+
+provider "aws" {
+    foo = "${var.foo}"
+}
+
+resource "aws_instance" "bar" {}