diff --git a/terraform/context_test.go b/terraform/context_test.go
index e1ec61724..ef059d9ab 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -164,6 +164,36 @@ func TestContextApply(t *testing.T) {
 	}
 }
 
+func TestContextApply_Minimal(t *testing.T) {
+	c := testConfig(t, "apply-minimal")
+	p := testProvider("aws")
+	p.ApplyFn = testApplyFn
+	p.DiffFn = testDiffFn
+	ctx := testContext(t, &ContextOpts{
+		Config: c,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+	})
+
+	if _, err := ctx.Plan(nil); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	ctx.variables = map[string]string{"value": "1"}
+
+	state, err := ctx.Apply()
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	actual := strings.TrimSpace(state.String())
+	expected := strings.TrimSpace(testTerraformApplyMinimalStr)
+	if actual != expected {
+		t.Fatalf("bad: \n%s", actual)
+	}
+}
+
 func TestContextApply_cancel(t *testing.T) {
 	stopped := false
 
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 83bc4096d..caccef7b7 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -107,6 +107,15 @@ aws_instance.foo:
   type = aws_instance
 `
 
+const testTerraformApplyMinimalStr = `
+aws_instance.bar:
+  ID = foo
+  type = aws_instance
+aws_instance.foo:
+  ID = foo
+  type = aws_instance
+`
+
 const testTerraformApplyDestroyStr = `
 <no state>
 `
diff --git a/terraform/test-fixtures/apply-minimal/main.tf b/terraform/test-fixtures/apply-minimal/main.tf
new file mode 100644
index 000000000..88002d078
--- /dev/null
+++ b/terraform/test-fixtures/apply-minimal/main.tf
@@ -0,0 +1,5 @@
+resource "aws_instance" "foo" {
+}
+
+resource "aws_instance" "bar" {
+}