diff --git a/tests/gold_tests/h2/replay_h2origin/h1-client-h2-origin.yaml b/tests/gold_tests/h2/replay_h2origin/h1-client-h2-origin.yaml
index 93fa1cff5df..21e6a30b10b 100644
--- a/tests/gold_tests/h2/replay_h2origin/h1-client-h2-origin.yaml
+++ b/tests/gold_tests/h2/replay_h2origin/h1-client-h2-origin.yaml
@@ -21,18 +21,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 1 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: GET
@@ -75,7 +63,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -87,7 +74,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -103,18 +89,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 2 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: GET
@@ -157,7 +131,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -169,7 +142,6 @@ sessions:
         proxy-response:
           version: '1.1'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -197,18 +169,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 3 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: POST
@@ -251,7 +211,6 @@ sessions:
         server-response:
           version: '2'
           status: 404
-          reason: "Not Found"
           headers:
             encoding: esc_json
             fields:
@@ -263,7 +222,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 404
-          reason: "Not Found"
           headers:
             encoding: esc_json
             fields:
@@ -277,18 +235,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 4 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: POST
@@ -331,7 +277,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -343,7 +288,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -358,18 +302,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 12 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: POST
@@ -386,7 +318,7 @@ sessions:
         proxy-request:
           protocol:
             - name: http
-              version: '1.1'
+              version: '2'
             - name: tls
               version: TLSv1.2
               sni: data.brian.example.com
@@ -412,7 +344,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -424,7 +355,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -439,18 +369,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 13 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: POST
@@ -467,7 +385,7 @@ sessions:
         proxy-request:
           protocol:
             - name: http
-              version: '1.1'
+              version: '2'
             - name: tls
               version: TLSv1.2
               sni: data.brian.example.com
@@ -493,7 +411,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -505,7 +422,6 @@ sessions:
         proxy-response:
           version: '1.1'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -520,18 +436,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 14 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '1.1'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '1.1'
           scheme: https
           method: POST
@@ -574,7 +478,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -586,7 +489,6 @@ sessions:
         proxy-response:
           version: '1.1'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
diff --git a/tests/gold_tests/h2/replay_h2origin/h2-origin.yaml b/tests/gold_tests/h2/replay_h2origin/h2-origin.yaml
index 65b133375a4..6cead4e3cd6 100644
--- a/tests/gold_tests/h2/replay_h2origin/h2-origin.yaml
+++ b/tests/gold_tests/h2/replay_h2origin/h2-origin.yaml
@@ -21,18 +21,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 5 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: GET
@@ -76,7 +64,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -88,7 +75,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -104,18 +90,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 6 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: GET
@@ -159,7 +133,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -171,7 +144,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -199,18 +171,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 7 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: POST
@@ -255,7 +215,6 @@ sessions:
         server-response:
           version: '2'
           status: 404
-          reason: "Not Found"
           headers:
             encoding: esc_json
             fields:
@@ -267,7 +226,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 404
-          reason: "Not Found"
           headers:
             encoding: esc_json
             fields:
@@ -279,7 +237,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 404
-          reason: "Not Found"
           headers:
             encoding: esc_json
             fields:
@@ -294,18 +251,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 8 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: POST
@@ -348,7 +293,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -360,7 +304,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -375,18 +318,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 9 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: POST
@@ -429,7 +360,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -441,7 +371,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -453,7 +382,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -468,18 +396,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 10 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: POST
@@ -521,7 +437,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -533,7 +448,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -548,18 +462,6 @@ sessions:
       - all: { headers: { fields: [[ uuid, 11 ]]}}
 
         client-request:
-          protocol:
-            - name: http
-              version: '2'
-            - name: tls
-              version: TLSv1.2
-              sni: data.brian.example.com
-              proxy-verify-mode: 1
-              proxy-provided-cert: false
-            - name: tcp
-            - name: ip
-              version: '4'
-
           version: '2'
           scheme: https
           method: POST
@@ -602,7 +504,6 @@ sessions:
         server-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
@@ -614,7 +515,6 @@ sessions:
         proxy-response:
           version: '2'
           status: 200
-          reason: OK
           headers:
             encoding: esc_json
             fields:
diff --git a/tests/prepare_proxy_verifier.sh b/tests/prepare_proxy_verifier.sh
index 2c34df74006..f66d2aef238 100755
--- a/tests/prepare_proxy_verifier.sh
+++ b/tests/prepare_proxy_verifier.sh
@@ -40,7 +40,7 @@ pv_dir="${pv_name}-${pv_version}"
 pv_tar_filename="${pv_dir}.tar.gz"
 pv_tar="${pv_top_dir}/${pv_tar_filename}"
 pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename}"
-expected_sha1="011bd50b74a07484683ed56a671f37afbdd0c786"
+expected_sha1="c3f732b80a8dec6fed48531c76eaa3d2f856f29a"
 pv_client="${bin_dir}/verifier-client"
 pv_server="${bin_dir}/verifier-server"
 TAR=${TAR:-tar}
@@ -78,10 +78,10 @@ EOF
     Darwin)
         case $(uname -m) in
         x86_64)
-            pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-x86_64"
+            pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-amd64"
             ;;
         arm64)
-            pv_os_dir="${pv_unpack_dir}/${pv_dir}/mac-m1"
+            pv_os_dir="${pv_unpack_dir}/${pv_dir}/darwin-arm64"
             ;;
         *)
             fail "Unrecognized Mac architecture: $(uname -m)"
@@ -90,6 +90,17 @@ EOF
         ;;
     Linux)
         pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux"
+        case $(uname -m) in
+        x86_64)
+            pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-amd64"
+            ;;
+        aarch64)
+            pv_os_dir="${pv_unpack_dir}/${pv_dir}/linux-arm64"
+            ;;
+        *)
+            fail "Unrecognized Linux architecture: $(uname -m)"
+            ;;
+        esac
         ;;
     *)
         fail "We need to build proxy-verifier for $(uname -s)"
diff --git a/tests/proxy-verifier-version.txt b/tests/proxy-verifier-version.txt
index 8a965c11682..873ca0fa627 100644
--- a/tests/proxy-verifier-version.txt
+++ b/tests/proxy-verifier-version.txt
@@ -1 +1 @@
-v2.6.0
+v2.7.0