diff --git a/command/connect/envoy/testdata/ingress-gateway-register-without-service-with-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-without-service-with-proxy-id.golden
deleted file mode 100644
index e57742555d..0000000000
--- a/command/connect/envoy/testdata/ingress-gateway-register-without-service-with-proxy-id.golden
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-  "admin": {
-    "access_log_path": "/dev/null",
-    "address": {
-      "socket_address": {
-        "address": "127.0.0.1",
-        "port_value": 19000
-      }
-    }
-  },
-  "node": {
-    "cluster": "my-gateway",
-    "id": "my-gateway",
-    "metadata": {
-      "namespace": "default",
-      "envoy_version": "1.14.3"
-    }
-  },
-  "static_resources": {
-    "clusters": [
-      {
-        "name": "local_agent",
-        "connect_timeout": "1s",
-        "type": "STATIC",
-        "http2_protocol_options": {},
-        "hosts": [
-          {
-            "socket_address": {
-              "address": "127.0.0.1",
-              "port_value": 8502
-            }
-          }
-        ]
-      },
-      {
-        "name": "self_admin",
-        "connect_timeout": "5s",
-        "type": "STATIC",
-        "http_protocol_options": {},
-        "hosts": [
-          {
-            "socket_address": {
-              "address": "127.0.0.1",
-              "port_value": 19000
-            }
-          }
-        ]
-      }
-    ],
-    "listeners": [
-      {
-        "name": "envoy_ready_listener",
-        "address": {
-          "socket_address": {
-            "address": "127.0.0.1",
-            "port_value": 7777
-          }
-        },
-        "filter_chains": [
-          {
-            "filters": [
-              {
-                "name": "envoy.http_connection_manager",
-                "config": {
-                  "stat_prefix": "envoy_ready",
-                  "codec_type": "HTTP1",
-                  "route_config": {
-                    "name": "self_admin_route",
-                    "virtual_hosts": [
-                      {
-                        "name": "self_admin",
-                        "domains": [
-                          "*"
-                        ],
-                        "routes": [
-                          {
-                            "match": {
-                              "path": "/ready"
-                            },
-                            "route": {
-                              "cluster": "self_admin",
-                              "prefix_rewrite": "/ready"
-                            }
-                          },
-                          {
-                            "match": {
-                              "prefix": "/"
-                            },
-                            "direct_response": {
-                              "status": 404
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "http_filters": [
-                    {
-                      "name": "envoy.router"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "stats_config": {
-    "stats_tags": [
-      {
-        "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.custom_hash"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.service_subset"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.service"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.namespace"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.datacenter"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.routing_type"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)",
-        "tag_name": "consul.trust_domain"
-      },
-      {
-        "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.target"
-      },
-      {
-        "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)",
-        "tag_name": "consul.full_target"
-      },
-      {
-        "tag_name": "local_cluster",
-        "fixed_value": "my-gateway"
-      }
-    ],
-    "use_all_default_tags": true
-  },
-  "dynamic_resources": {
-    "lds_config": {
-      "ads": {}
-    },
-    "cds_config": {
-      "ads": {}
-    },
-    "ads_config": {
-      "api_type": "GRPC",
-      "grpc_services": {
-        "initial_metadata": [
-          {
-            "key": "x-consul-token",
-            "value": ""
-          }
-        ],
-        "envoy_grpc": {
-          "cluster_name": "local_agent"
-        }
-      }
-    }
-  },
-  "layered_runtime": {
-    "layers": [
-      {
-        "name": "static_layer",
-        "static_layer": {
-          "envoy.deprecated_features:envoy.api.v2.Cluster.tls_context": true,
-          "envoy.deprecated_features:envoy.config.trace.v2.ZipkinConfig.HTTP_JSON_V1": true,
-          "envoy.deprecated_features:envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing.operation_name": true
-        }
-      }
-    ]
-  }
-}
diff --git a/command/connect/envoy/testdata/ingress-gateway-without-register.golden b/command/connect/envoy/testdata/ingress-gateway-without-register.golden
deleted file mode 100644
index e5c683d827..0000000000
--- a/command/connect/envoy/testdata/ingress-gateway-without-register.golden
+++ /dev/null
@@ -1,189 +0,0 @@
-{
-  "admin": {
-    "access_log_path": "/dev/null",
-    "address": {
-      "socket_address": {
-        "address": "127.0.0.1",
-        "port_value": 19000
-      }
-    }
-  },
-  "node": {
-    "cluster": "ingress-gateway",
-    "id": "ingress-gateway",
-    "metadata": {
-      "namespace": "default",
-      "envoy_version": "1.14.3"
-    }
-  },
-  "static_resources": {
-    "clusters": [
-      {
-        "name": "local_agent",
-        "connect_timeout": "1s",
-        "type": "STATIC",
-        "http2_protocol_options": {},
-        "hosts": [
-          {
-            "socket_address": {
-              "address": "127.0.0.1",
-              "port_value": 8502
-            }
-          }
-        ]
-      },
-      {
-        "name": "self_admin",
-        "connect_timeout": "5s",
-        "type": "STATIC",
-        "http_protocol_options": {},
-        "hosts": [
-          {
-            "socket_address": {
-              "address": "127.0.0.1",
-              "port_value": 19000
-            }
-          }
-        ]
-      }
-    ],
-    "listeners": [
-      {
-        "name": "envoy_ready_listener",
-        "address": {
-          "socket_address": {
-            "address": "127.0.0.1",
-            "port_value": 7777
-          }
-        },
-        "filter_chains": [
-          {
-            "filters": [
-              {
-                "name": "envoy.http_connection_manager",
-                "config": {
-                  "stat_prefix": "envoy_ready",
-                  "codec_type": "HTTP1",
-                  "route_config": {
-                    "name": "self_admin_route",
-                    "virtual_hosts": [
-                      {
-                        "name": "self_admin",
-                        "domains": [
-                          "*"
-                        ],
-                        "routes": [
-                          {
-                            "match": {
-                              "path": "/ready"
-                            },
-                            "route": {
-                              "cluster": "self_admin",
-                              "prefix_rewrite": "/ready"
-                            }
-                          },
-                          {
-                            "match": {
-                              "prefix": "/"
-                            },
-                            "direct_response": {
-                              "status": 404
-                            }
-                          }
-                        ]
-                      }
-                    ]
-                  },
-                  "http_filters": [
-                    {
-                      "name": "envoy.router"
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        ]
-      }
-    ]
-  },
-  "stats_config": {
-    "stats_tags": [
-      {
-        "regex": "^cluster\\.((?:([^.]+)~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.custom_hash"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:([^.]+)\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.service_subset"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.service"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.namespace"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.datacenter"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.routing_type"
-      },
-      {
-        "regex": "^cluster\\.((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.([^.]+)\\.consul\\.)",
-        "tag_name": "consul.trust_domain"
-      },
-      {
-        "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+)\\.[^.]+\\.[^.]+\\.consul\\.)",
-        "tag_name": "consul.target"
-      },
-      {
-        "regex": "^cluster\\.(((?:[^.]+~)?(?:[^.]+\\.)?[^.]+\\.[^.]+\\.[^.]+\\.[^.]+\\.[^.]+)\\.consul\\.)",
-        "tag_name": "consul.full_target"
-      },
-      {
-        "tag_name": "local_cluster",
-        "fixed_value": "ingress-gateway"
-      }
-    ],
-    "use_all_default_tags": true
-  },
-  "dynamic_resources": {
-    "lds_config": {
-      "ads": {}
-    },
-    "cds_config": {
-      "ads": {}
-    },
-    "ads_config": {
-      "api_type": "GRPC",
-      "grpc_services": {
-        "initial_metadata": [
-          {
-            "key": "x-consul-token",
-            "value": ""
-          }
-        ],
-        "envoy_grpc": {
-          "cluster_name": "local_agent"
-        }
-      }
-    }
-  },
-  "layered_runtime": {
-    "layers": [
-      {
-        "name": "static_layer",
-        "static_layer": {
-          "envoy.deprecated_features:envoy.api.v2.Cluster.tls_context": true,
-          "envoy.deprecated_features:envoy.config.trace.v2.ZipkinConfig.HTTP_JSON_V1": true,
-          "envoy.deprecated_features:envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing.operation_name": true
-        }
-      }
-    ]
-  }
-}