diff --git a/terraform/context_import_test.go b/terraform/context_import_test.go
index d50e61d17..f8e9dddec 100644
--- a/terraform/context_import_test.go
+++ b/terraform/context_import_test.go
@@ -181,6 +181,56 @@ func TestContextImport_moduleDepth2(t *testing.T) {
 	}
 }
 
+func TestContextImport_moduleExisting(t *testing.T) {
+	p := testProvider("aws")
+	ctx := testContext2(t, &ContextOpts{
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+
+		State: &State{
+			Modules: []*ModuleState{
+				&ModuleState{
+					Path: []string{"root", "foo"},
+					Resources: map[string]*ResourceState{
+						"aws_instance.bar": &ResourceState{
+							Type: "aws_instance",
+							Primary: &InstanceState{
+								ID: "bar",
+							},
+						},
+					},
+				},
+			},
+		},
+	})
+
+	p.ImportStateReturn = []*InstanceState{
+		&InstanceState{
+			ID:        "foo",
+			Ephemeral: EphemeralState{Type: "aws_instance"},
+		},
+	}
+
+	state, err := ctx.Import(&ImportOpts{
+		Targets: []*ImportTarget{
+			&ImportTarget{
+				Addr: "module.foo.aws_instance.foo",
+				ID:   "bar",
+			},
+		},
+	})
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(state.String())
+	expected := strings.TrimSpace(testImportModuleExistingStr)
+	if actual != expected {
+		t.Fatalf("bad: \n%s", actual)
+	}
+}
+
 const testImportStr = `
 aws_instance.foo:
   ID = foo
@@ -203,6 +253,15 @@ module.a.b:
     provider = aws
 `
 
+const testImportModuleExistingStr = `
+module.foo:
+  aws_instance.bar:
+    ID = bar
+  aws_instance.foo:
+    ID = foo
+    provider = aws
+`
+
 const testImportRefreshStr = `
 aws_instance.foo:
   ID = foo