diff --git a/terraform/context_test.go b/terraform/context_test.go
index 6c9a8e34c..caee0f761 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -2984,6 +2984,52 @@ func TestContext2Input_provider(t *testing.T) {
 	}
 }
 
+func TestContext2Input_providerMulti(t *testing.T) {
+	m := testModule(t, "input-provider-multi")
+	p := testProvider("aws")
+	p.ApplyFn = testApplyFn
+	p.DiffFn = testDiffFn
+	ctx := testContext2(t, &ContextOpts{
+		Module: m,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+	})
+
+	var actual []interface{}
+	var lock sync.Mutex
+	p.InputFn = func(i UIInput, c *ResourceConfig) (*ResourceConfig, error) {
+		c.Config["foo"] = "bar"
+		return c, nil
+	}
+	p.ConfigureFn = func(c *ResourceConfig) error {
+		lock.Lock()
+		defer lock.Unlock()
+		actual = append(actual, c.Config["foo"])
+		return nil
+	}
+	p.ValidateFn = func(c *ResourceConfig) ([]string, []error) {
+		return nil, c.CheckSet([]string{"foo"})
+	}
+
+	if err := ctx.Input(InputModeStd); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if _, err := ctx.Plan(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	if _, err := ctx.Apply(); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	expected := []interface{}{"bar", "bar"}
+	if !reflect.DeepEqual(actual, expected) {
+		t.Fatalf("bad: %#v", actual)
+	}
+}
+
 func TestContext2Input_providerOnce(t *testing.T) {
 	m := testModule(t, "input-provider-once")
 	p := testProvider("aws")
diff --git a/terraform/test-fixtures/input-provider-multi/main.tf b/terraform/test-fixtures/input-provider-multi/main.tf
new file mode 100644
index 000000000..f746e41a9
--- /dev/null
+++ b/terraform/test-fixtures/input-provider-multi/main.tf
@@ -0,0 +1,9 @@
+provider "aws" {
+    alias = "east"
+}
+
+resource "aws_instance" "foo" {
+    alias = "east"
+}
+
+resource "aws_instance" "bar" {}