diff --git a/terraform/context_test.go b/terraform/context_test.go
index a9e702b51..1aa682395 100644
--- a/terraform/context_test.go
+++ b/terraform/context_test.go
@@ -935,6 +935,55 @@ func TestContextApply_provisionerFail_createBeforeDestroy(t *testing.T) {
 	}
 }
 
+func TestContextApply_error_createBeforeDestroy(t *testing.T) {
+	c := testConfig(t, "apply-error-create-before")
+	p := testProvider("aws")
+	state := &State{
+		Modules: []*ModuleState{
+			&ModuleState{
+				Path: rootModulePath,
+				Resources: map[string]*ResourceState{
+					"aws_instance.bar": &ResourceState{
+						Type: "aws_instance",
+						Primary: &InstanceState{
+							ID: "bar",
+							Attributes: map[string]string{
+								"require_new": "abc",
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+	ctx := testContext(t, &ContextOpts{
+		Config: c,
+		Providers: map[string]ResourceProviderFactory{
+			"aws": testProviderFuncFixed(p),
+		},
+		State: state,
+	})
+	p.ApplyFn = func(info *InstanceInfo, is *InstanceState, id *InstanceDiff) (*InstanceState, error) {
+		return nil, fmt.Errorf("error")
+	}
+	p.DiffFn = testDiffFn
+
+	if _, err := ctx.Plan(nil); err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	state, err := ctx.Apply()
+	if err == nil {
+		t.Fatal("should have error")
+	}
+
+	actual := strings.TrimSpace(state.String())
+	expected := strings.TrimSpace(testTerraformApplyErrorCreateBeforeDestroyStr)
+	if actual != expected {
+		t.Fatalf("bad: \n%s\n\n\n%s", actual, expected)
+	}
+}
+
 func TestContextApply_provisionerResourceRef(t *testing.T) {
 	m := testModule(t, "apply-provisioner-resource-ref")
 	p := testProvider("aws")
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 52e8700bd..abc103393 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -254,6 +254,12 @@ aws_instance.foo:
   num = 2
 `
 
+const testTerraformApplyErrorCreateBeforeDestroyStr = `
+aws_instance.bar:
+  ID = bar
+  require_new = abc
+`
+
 const testTerraformApplyErrorPartialStr = `
 aws_instance.bar:
   ID = bar
diff --git a/terraform/test-fixtures/apply-error-create-before/main.tf b/terraform/test-fixtures/apply-error-create-before/main.tf
new file mode 100644
index 000000000..c7c2776eb
--- /dev/null
+++ b/terraform/test-fixtures/apply-error-create-before/main.tf
@@ -0,0 +1,6 @@
+resource "aws_instance" "bar" {
+    require_new = "xyz"
+    lifecycle {
+        create_before_destroy = true
+    }
+}