diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 8e33708dd7..7bbfabbb3f 100644
--- a/terraform/context_apply_test.go
+++ b/terraform/context_apply_test.go
@@ -408,7 +408,7 @@ func TestContext2Apply_resourceDependsOnModuleDestroy(t *testing.T) {
 			is *InstanceState,
 			id *InstanceDiff) (*InstanceState, error) {
 
-			if id.Attributes["ami"] != nil && id.Attributes["ami"].New == "parent" {
+			if is.Attributes["ami"] == "parent" {
 				checked = true
 
 				// Sleep to allow parallel execution
@@ -448,11 +448,7 @@ func TestContext2Apply_resourceDependsOnModuleDestroy(t *testing.T) {
 			t.Fatal("should check")
 		}
 
-		checkStateString(t, state, `
-<no state>
-module.child:
-  <no state>
-		`)
+		checkStateString(t, state, `<no state>`)
 	}
 }