diff --git a/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate b/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate
index cac5cd019..493fcde80 100644
--- a/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate
+++ b/states/statefile/testdata/roundtrip/v3-bigint.out.tfstate
@@ -28,7 +28,7 @@
             "type": "null_resource",
             "name": "bar",
             "each": "list",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "attributes_flat": {
@@ -60,7 +60,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "baz",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "attributes_flat": {
@@ -86,7 +86,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "foo",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "attributes_flat": {
diff --git a/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate b/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate
index cac5cd019..493fcde80 100644
--- a/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate
+++ b/states/statefile/testdata/roundtrip/v3-grabbag.out.tfstate
@@ -28,7 +28,7 @@
             "type": "null_resource",
             "name": "bar",
             "each": "list",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "attributes_flat": {
@@ -60,7 +60,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "baz",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "attributes_flat": {
@@ -86,7 +86,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "foo",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "attributes_flat": {
diff --git a/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate b/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate
index 2afd8d787..9ac170c86 100644
--- a/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate
+++ b/states/statefile/testdata/roundtrip/v3-invalid-depends.out.tfstate
@@ -14,7 +14,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "bar",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "schema_version": 0,
diff --git a/states/statefile/testdata/roundtrip/v3-simple.out.tfstate b/states/statefile/testdata/roundtrip/v3-simple.out.tfstate
index 2cae1a5ef..b61661ab9 100644
--- a/states/statefile/testdata/roundtrip/v3-simple.out.tfstate
+++ b/states/statefile/testdata/roundtrip/v3-simple.out.tfstate
@@ -14,7 +14,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "bar",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "schema_version": 0,
@@ -35,7 +35,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "foo",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "each": "list",
             "instances": [
                 {
@@ -62,7 +62,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "foobar",
-            "provider": "provider[\"registry.terraform.io/-/null\"]",
+            "provider": "provider.null",
             "instances": [
                 {
                     "schema_version": 0,
diff --git a/states/statefile/testdata/roundtrip/v4-simple.in.tfstate b/states/statefile/testdata/roundtrip/v4-simple.in.tfstate
index 5d3c0af9f..8d54e6d62 100644
--- a/states/statefile/testdata/roundtrip/v4-simple.in.tfstate
+++ b/states/statefile/testdata/roundtrip/v4-simple.in.tfstate
@@ -33,7 +33,7 @@
             "mode": "managed",
             "type": "null_resource",
             "name": "foo",
-            "provider": "provider.null",
+            "provider": "provider[\"registry.terraform.io/-/null\"]",
             "each": "list",
             "instances": [
                 {
diff --git a/states/statefile/version3_upgrade.go b/states/statefile/version3_upgrade.go
index 905183ada..f3edac119 100644
--- a/states/statefile/version3_upgrade.go
+++ b/states/statefile/version3_upgrade.go
@@ -154,7 +154,7 @@ func upgradeStateV3ToV4(old *stateV3) (*stateV4, error) {
 					Type:           resAddr.Type,
 					Name:           resAddr.Name,
 					Instances:      []instanceObjectStateV4{},
-					ProviderConfig: providerAddr.String(),
+					ProviderConfig: providerAddr.LegacyString(),
 				}
 				resourceStates[resAddr.String()] = rs
 			}