diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 3b8a26427..d1c9cde11 100644
--- a/terraform/context_apply_test.go
+++ b/terraform/context_apply_test.go
@@ -8263,10 +8263,10 @@ func TestContext2Apply_vars(t *testing.T) {
 		t.Fatalf("err: %s", diags.Err())
 	}
 
-	actual := strings.TrimSpace(state.String())
-	expected := strings.TrimSpace(testTerraformApplyVarsStr)
-	if actual != expected {
-		t.Errorf("wrong result\n\ngot:\n%s\n\nwant:\n%s", actual, expected)
+	got := strings.TrimSpace(state.String())
+	want := strings.TrimSpace(testTerraformApplyVarsStr)
+	if got != want {
+		t.Errorf("wrong result\n\ngot:\n%s\n\nwant:\n%s", got, want)
 	}
 }
 
diff --git a/terraform/context_fixtures_test.go b/terraform/context_fixtures_test.go
index b0884a4f5..15eeb4ebc 100644
--- a/terraform/context_fixtures_test.go
+++ b/terraform/context_fixtures_test.go
@@ -38,6 +38,7 @@ func contextFixtureApplyVars(t *testing.T) *contextTestFixture {
 	c := testModule(t, "apply-vars")
 	p := mockProviderWithResourceTypeSchema("aws_instance", &configschema.Block{
 		Attributes: map[string]*configschema.Attribute{
+			"id":  {Type: cty.String, Computed: true},
 			"foo":  {Type: cty.String, Optional: true},
 			"bar":  {Type: cty.String, Optional: true},
 			"baz":  {Type: cty.String, Optional: true},
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 1f31965b5..f42f0a730 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -1017,7 +1017,6 @@ aws_instance.bar:
   bar = override
   baz = override
   foo = us-east-1
-  type = aws_instance
 aws_instance.foo:
   ID = foo
   provider = provider.aws
@@ -1029,7 +1028,6 @@ aws_instance.foo:
   map.Foo = Bar
   map.Hello = World
   num = 2
-  type = aws_instance
 `
 
 const testTerraformApplyVarsEnvStr = `