diff --git a/terraform/context_apply_test.go b/terraform/context_apply_test.go
index 52ed20daa..7ad55e4d4 100644
--- a/terraform/context_apply_test.go
+++ b/terraform/context_apply_test.go
@@ -5957,12 +5957,13 @@ func TestContext2Apply_destroyOrder(t *testing.T) {
 
 	t.Logf("State 1: %s", state)
 
-	// Next, plan and apply config-less to force a destroy with "apply"
+	// Next, plan and apply a destroy
 	h.Active = true
 	ctx = testContext2(t, &ContextOpts{
-		State:  state,
-		Module: module.NewEmptyTree(),
-		Hooks:  []Hook{h},
+		Destroy: true,
+		State:   state,
+		Module:  m,
+		Hooks:   []Hook{h},
 		ProviderResolver: ResourceProviderResolverFixed(
 			map[string]ResourceProviderFactory{
 				"aws": testProviderFuncFixed(p),
diff --git a/terraform/node_data_refresh.go b/terraform/node_data_refresh.go
index 7ab76c235..d5ca641a6 100644
--- a/terraform/node_data_refresh.go
+++ b/terraform/node_data_refresh.go
@@ -148,7 +148,7 @@ func (n *NodeRefreshableDataResourceInstance) EvalTree() EvalNode {
 			&EvalWriteState{
 				Name:         stateId,
 				ResourceType: rs.Type,
-				Provider:     rs.Provider,
+				Provider:     n.ResolvedProvider,
 				Dependencies: rs.Dependencies,
 				State:        &state, // state is nil here
 			},
@@ -210,7 +210,7 @@ func (n *NodeRefreshableDataResourceInstance) EvalTree() EvalNode {
 			&EvalWriteState{
 				Name:         stateId,
 				ResourceType: rs.Type,
-				Provider:     rs.Provider,
+				Provider:     n.ResolvedProvider,
 				Dependencies: rs.Dependencies,
 				State:        &state,
 			},
diff --git a/terraform/terraform_test.go b/terraform/terraform_test.go
index 4d645a9f7..0a84e34e6 100644
--- a/terraform/terraform_test.go
+++ b/terraform/terraform_test.go
@@ -1754,6 +1754,7 @@ hcl_instance.hcltest:
 const testTerraformRefreshDataRefDataStr = `
 data.null_data_source.bar:
   ID = foo
+  provider = provider.null
   bar = yes
   type = null_data_source
 
@@ -1761,6 +1762,7 @@ data.null_data_source.bar:
     data.null_data_source.foo
 data.null_data_source.foo:
   ID = foo
+  provider = provider.null
   foo = yes
   type = null_data_source
 `