diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-17-x.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-18-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-17-x.golden
rename to agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-18-x.golden
diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.v2compat.envoy-1-16-x.golden
similarity index 99%
rename from agent/xds/testdata/clusters/downstream-service-with-unix-sockets.v2compat.envoy-1-17-x.golden
rename to agent/xds/testdata/clusters/downstream-service-with-unix-sockets.v2compat.envoy-1-16-x.golden
index d7ce36196635..a8466b90ce8c 100644
--- a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.v2compat.envoy-1-17-x.golden
+++ b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.v2compat.envoy-1-16-x.golden
@@ -114,7 +114,7 @@
               {
                 "endpoint": {
                   "address": {
-                     "pipe": {
+                    "pipe": {
                       "path": "/tmp/downstream_proxy.sock"
                     }
                   }
diff --git a/agent/xds/testdata/listeners/ingress-gateway-unix-domain-socket.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway-unix-domain-socket.envoy-1-17-x.golden
deleted file mode 100644
index 059b112269ac..000000000000
--- a/agent/xds/testdata/listeners/ingress-gateway-unix-domain-socket.envoy-1-17-x.golden
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "versionInfo": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name": "db:1.2.3.4:9191",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "statPrefix": "upstream.db.default.dc1",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ],
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "nonce": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-gateway-unix-domain-socket.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway-unix-domain-socket.v2compat.envoy-1-17-x.golden
deleted file mode 100644
index 417d25f16856..000000000000
--- a/agent/xds/testdata/listeners/ingress-gateway-unix-domain-socket.v2compat.envoy-1-17-x.golden
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "versionInfo": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.api.v2.Listener",
-      "name": "db:1.2.3.4:9191",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filters": [
-            {
-              "name": "envoy.filters.network.tcp_proxy",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy",
-                "statPrefix": "upstream.db.default.dc1",
-                "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ],
-      "trafficDirection": "OUTBOUND"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
-  "nonce": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-18-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-17-x.golden
rename to agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-18-x.golden
diff --git a/agent/xds/testdata/listeners/listener-unix-domain-socket.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-unix-domain-socket.v2compat.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-unix-domain-socket.v2compat.envoy-1-17-x.golden
rename to agent/xds/testdata/listeners/listener-unix-domain-socket.v2compat.envoy-1-16-x.golden