diff --git a/gen/templates/data_source_test.go b/gen/templates/data_source_test.go
index b46c3f4e..5347c7a4 100644
--- a/gen/templates/data_source_test.go
+++ b/gen/templates/data_source_test.go
@@ -222,6 +222,9 @@ func testAccDataSourceCc{{camelCase .Name}}Config() string {
 			{{.TfName}} = {{if .TestValue}}{{.TestValue}}{{else}}{{if eq .Type "String"}}"{{.Example}}"{{else if isStringListSet .}}["{{.Example}}"]{{else if isInt64ListSet .}}[{{.Example}}]{{else}}{{.Example}}{{end}}{{end}}
 			{{- end}}
 			{{- end}}
+			{{- if .DataSourceNoId}}
+			depends_on = [catalystcenter_{{snakeCase $name}}.test]
+			{{- end}}
 		}
 	`
 	return config
diff --git a/internal/provider/data_source_catalystcenter_anycast_gateway_test.go b/internal/provider/data_source_catalystcenter_anycast_gateway_test.go
index 1569fa29..77121dd9 100644
--- a/internal/provider/data_source_catalystcenter_anycast_gateway_test.go
+++ b/internal/provider/data_source_catalystcenter_anycast_gateway_test.go
@@ -117,6 +117,7 @@ func testAccDataSourceCcAnycastGatewayConfig() string {
 			fabric_id = catalystcenter_fabric_site.test.id
 			virtual_network_name = catalystcenter_virtual_network_to_fabric_site.test.virtual_network_name
 			ip_pool_name = catalystcenter_ip_pool_reservation.test.name
+			depends_on = [catalystcenter_anycast_gateway.test]
 		}
 	`
 	return config
diff --git a/internal/provider/data_source_catalystcenter_assign_templates_to_tag_test.go b/internal/provider/data_source_catalystcenter_assign_templates_to_tag_test.go
index 09c41b25..41e13416 100644
--- a/internal/provider/data_source_catalystcenter_assign_templates_to_tag_test.go
+++ b/internal/provider/data_source_catalystcenter_assign_templates_to_tag_test.go
@@ -87,6 +87,7 @@ func testAccDataSourceCcAssignTemplatesToTagConfig() string {
 	config += `
 		data "catalystcenter_assign_templates_to_tag" "test" {
 			tag_id = catalystcenter_tag.test.id
+			depends_on = [catalystcenter_assign_templates_to_tag.test]
 		}
 	`
 	return config
diff --git a/internal/provider/data_source_catalystcenter_fabric_device_test.go b/internal/provider/data_source_catalystcenter_fabric_device_test.go
index 1efded46..edcdfdd6 100644
--- a/internal/provider/data_source_catalystcenter_fabric_device_test.go
+++ b/internal/provider/data_source_catalystcenter_fabric_device_test.go
@@ -89,6 +89,7 @@ func testAccDataSourceCcFabricDeviceConfig() string {
 		data "catalystcenter_fabric_device" "test" {
 			network_device_id = "5e6f7b3a-2b0b-4a7d-8b1c-0d4b1cd5e1b1"
 			fabric_id = catalystcenter_fabric_site.test.id
+			depends_on = [catalystcenter_fabric_device.test]
 		}
 	`
 	return config
diff --git a/internal/provider/data_source_catalystcenter_fabric_provision_device_test.go b/internal/provider/data_source_catalystcenter_fabric_provision_device_test.go
index 94c31280..87c928ac 100644
--- a/internal/provider/data_source_catalystcenter_fabric_provision_device_test.go
+++ b/internal/provider/data_source_catalystcenter_fabric_provision_device_test.go
@@ -75,6 +75,7 @@ func testAccDataSourceCcFabricProvisionDeviceConfig() string {
 		data "catalystcenter_fabric_provision_device" "test" {
 			site_id = catalystcenter_area.test.id
 			network_device_id = "4cb565d3-1944-42be-be9f-a87cff79e831"
+			depends_on = [catalystcenter_fabric_provision_device.test]
 		}
 	`
 	return config
diff --git a/internal/provider/data_source_catalystcenter_tag_test.go b/internal/provider/data_source_catalystcenter_tag_test.go
index c3233572..5aa448e1 100644
--- a/internal/provider/data_source_catalystcenter_tag_test.go
+++ b/internal/provider/data_source_catalystcenter_tag_test.go
@@ -60,6 +60,7 @@ func testAccDataSourceCcTagConfig() string {
 	config += `
 		data "catalystcenter_tag" "test" {
 			name = "Tag1"
+			depends_on = [catalystcenter_tag.test]
 		}
 	`
 	return config
diff --git a/internal/provider/data_source_catalystcenter_transit_peer_network_test.go b/internal/provider/data_source_catalystcenter_transit_peer_network_test.go
index c6afe8e3..ba346637 100644
--- a/internal/provider/data_source_catalystcenter_transit_peer_network_test.go
+++ b/internal/provider/data_source_catalystcenter_transit_peer_network_test.go
@@ -62,6 +62,7 @@ func testAccDataSourceCcTransitPeerNetworkConfig() string {
 	config += `
 		data "catalystcenter_transit_peer_network" "test" {
 			transit_peer_network_name = "TRANSIT_1"
+			depends_on = [catalystcenter_transit_peer_network.test]
 		}
 	`
 	return config