diff --git a/config/v2_1/types/partition_test.go b/config/v2_1/types/partition_test.go
index 8bda53ee2d..2b76e87c09 100644
--- a/config/v2_1/types/partition_test.go
+++ b/config/v2_1/types/partition_test.go
@@ -74,7 +74,7 @@ func TestValidateTypeGUID(t *testing.T) {
 		out out
 	}{
 		{
-			in{"$uuid35"},
+			in{"5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"},
 			out{report.Report{}},
 		},
 		{
@@ -106,7 +106,7 @@ func TestValidateGUID(t *testing.T) {
 		out out
 	}{
 		{
-			in{"$uuid35"},
+			in{"5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"},
 			out{report.Report{}},
 		},
 		{
diff --git a/config/v2_2/types/partition_test.go b/config/v2_2/types/partition_test.go
index 8bda53ee2d..2b76e87c09 100644
--- a/config/v2_2/types/partition_test.go
+++ b/config/v2_2/types/partition_test.go
@@ -74,7 +74,7 @@ func TestValidateTypeGUID(t *testing.T) {
 		out out
 	}{
 		{
-			in{"$uuid35"},
+			in{"5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"},
 			out{report.Report{}},
 		},
 		{
@@ -106,7 +106,7 @@ func TestValidateGUID(t *testing.T) {
 		out out
 	}{
 		{
-			in{"$uuid35"},
+			in{"5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"},
 			out{report.Report{}},
 		},
 		{
diff --git a/config/v2_3_experimental/types/partition_test.go b/config/v2_3_experimental/types/partition_test.go
index b691ff3469..e842eed9a0 100644
--- a/config/v2_3_experimental/types/partition_test.go
+++ b/config/v2_3_experimental/types/partition_test.go
@@ -83,7 +83,7 @@ func TestValidateTypeGUID(t *testing.T) {
 		out out
 	}{
 		{
-			in{"$uuid35"},
+			in{"5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"},
 			out{report.Report{}},
 		},
 		{
@@ -115,7 +115,7 @@ func TestValidateGUID(t *testing.T) {
 		out out
 	}{
 		{
-			in{"$uuid35"},
+			in{"5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"},
 			out{report.Report{}},
 		},
 		{
diff --git a/tests/filesystem.go b/tests/filesystem.go
index 8979cf8a53..9e36e644c4 100644
--- a/tests/filesystem.go
+++ b/tests/filesystem.go
@@ -340,7 +340,7 @@ func updateTypeGUID(t *testing.T, partition *types.Partition) error {
 	partitionTypes := map[string]string{
 		"coreos-resize":   "3884DD41-8582-4404-B9A8-E9B84F2DF50E",
 		"data":            "0FC63DAF-8483-4772-8E79-3D69D8477DE4",
-		"coreos-rootfs":   "$uuid35",
+		"coreos-rootfs":   "5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6",
 		"bios":            "21686148-6449-6E6F-744E-656564454649",
 		"efi":             "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
 		"coreos-reserved": "C95DC21A-DF0E-4340-8D7B-26CBFA9A03E0",
diff --git a/tests/positive/partitions/verification.go b/tests/positive/partitions/verification.go
index 24a71a9bd4..a1f376e81d 100644
--- a/tests/positive/partitions/verification.go
+++ b/tests/positive/partitions/verification.go
@@ -56,7 +56,7 @@ func VerifyBaseDisk() types.Test {
 					"number": 3,
 					"start": 270336,
 					"size": 2097152,
-					"typeGuid": "$uuid35",
+					"typeGuid": "5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6",
 					"guid": "$uuid33"
 				},
 				{
@@ -64,7 +64,7 @@ func VerifyBaseDisk() types.Test {
 					"number": 4,
 					"start": 2367488,
 					"size": 2097152,
-					"typeGuid": "$uuid35",
+					"typeGuid": "5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6",
 					"guid": "$uuid34"
 				},
 				{
@@ -137,7 +137,7 @@ func VerifyBaseDiskWithWipe() types.Test {
 					"start": 270336,
 					"size": 2097152,
 					"wipePartitionEntry": true,
-					"typeGuid": "$uuid35"
+					"typeGuid": "5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6"
 				},
 				{
 					"label": "USR-B",
@@ -145,7 +145,7 @@ func VerifyBaseDiskWithWipe() types.Test {
 					"start": 2367488,
 					"size": 2097152,
 					"wipePartitionEntry": true,
-					"typeGuid": "$uuid35",
+					"typeGuid": "5DFBF5F4-2848-4BAC-AA5E-0D9A20B745A6",
 					"guid": "$uuid34"
 				},
 				{