diff --git a/terraform/graph_builder_apply_test.go b/terraform/graph_builder_apply_test.go
index 432cf4fc3..ccc14399a 100644
--- a/terraform/graph_builder_apply_test.go
+++ b/terraform/graph_builder_apply_test.go
@@ -497,16 +497,13 @@ meta.count-boundary (count boundary fixup)
   aws_instance.other
   module.child.aws_instance.create
   module.child.aws_instance.other
-  module.child.provider.aws
   module.child.provisioner.exec
   provider.aws
 module.child.aws_instance.create
-  module.child.provider.aws
   module.child.provisioner.exec
+  provider.aws
 module.child.aws_instance.other
   module.child.aws_instance.create
-  module.child.provider.aws
-module.child.provider.aws
   provider.aws
 module.child.provisioner.exec
 provider.aws
@@ -515,7 +512,6 @@ provider.aws (close)
   aws_instance.other
   module.child.aws_instance.create
   module.child.aws_instance.other
-  module.child.provider.aws
   provider.aws
 provisioner.exec (close)
   module.child.aws_instance.create
diff --git a/terraform/module_dependencies_test.go b/terraform/module_dependencies_test.go
index 39e4e7de5..8bcbef062 100644
--- a/terraform/module_dependencies_test.go
+++ b/terraform/module_dependencies_test.go
@@ -73,8 +73,7 @@ func TestModuleTreeDependencies(t *testing.T) {
 				Providers: moduledeps.Providers{
 					"foo": moduledeps.ProviderDependency{
 						Constraints: discovery.AllVersions,
-						//Reason:      moduledeps.ProviderDependencyImplicit,
-						Reason: moduledeps.ProviderDependencyExplicit,
+						Reason:      moduledeps.ProviderDependencyImplicit,
 					},
 					"foo.baz": moduledeps.ProviderDependency{
 						Constraints: discovery.AllVersions,
@@ -119,28 +118,25 @@ func TestModuleTreeDependencies(t *testing.T) {
 						Providers: moduledeps.Providers{
 							"foo": moduledeps.ProviderDependency{
 								Constraints: discovery.AllVersions,
-								//Reason:      moduledeps.ProviderDependencyInherited,
-								Reason: moduledeps.ProviderDependencyExplicit,
+								Reason:      moduledeps.ProviderDependencyInherited,
 							},
 							"baz": moduledeps.ProviderDependency{
 								Constraints: discovery.AllVersions,
-								//Reason:      moduledeps.ProviderDependencyImplicit,
-								Reason: moduledeps.ProviderDependencyExplicit,
+								Reason:      moduledeps.ProviderDependencyImplicit,
 							},
 						},
 						Children: []*moduledeps.Module{
 							{
 								Name: "grandchild",
 								Providers: moduledeps.Providers{
+									"bar": moduledeps.ProviderDependency{
+										Constraints: discovery.AllVersions,
+										Reason:      moduledeps.ProviderDependencyInherited,
+									},
 									"foo": moduledeps.ProviderDependency{
 										Constraints: discovery.AllVersions,
 										Reason:      moduledeps.ProviderDependencyExplicit,
 									},
-									"bar": moduledeps.ProviderDependency{
-										Constraints: discovery.AllVersions,
-										//Reason:      moduledeps.ProviderDependencyInherited,
-										Reason: moduledeps.ProviderDependencyExplicit,
-									},
 								},
 							},
 						},
diff --git a/terraform/transform_provider_test.go b/terraform/transform_provider_test.go
index f98ccc0ea..42995b8a3 100644
--- a/terraform/transform_provider_test.go
+++ b/terraform/transform_provider_test.go
@@ -477,16 +477,12 @@ provider.foo (close)
 
 const testTransformMissingGrandchildProviderStr = `
 module.sub.module.subsub.bar_instance.two
-  module.sub.module.subsub.provider.bar
+  provider.bar
 module.sub.module.subsub.foo_instance.one
-  module.sub.module.subsub.provider.foo
-module.sub.module.subsub.provider.bar
-  provider.bar (disabled)
-module.sub.module.subsub.provider.foo
+  module.sub.provider.foo
+module.sub.provider.foo
   provider.foo (disabled)
-module.sub.provider.foo (disabled)
-  provider.foo (disabled)
-provider.bar (disabled)
+provider.bar
 provider.foo (disabled)
 `