diff --git a/test/tracetesting/tech-based-tests/payment-service/amex-credit-card-not-allowed.yaml b/test/tracetesting/tech-based-tests/payment-service/amex-credit-card-not-allowed.yaml
index 8716abfe29..3c56cb91af 100644
--- a/test/tracetesting/tech-based-tests/payment-service/amex-credit-card-not-allowed.yaml
+++ b/test/tracetesting/tech-based-tests/payment-service/amex-credit-card-not-allowed.yaml
@@ -349,5 +349,8 @@ spec:
   - name: It should call Charge method and receive a gRPC error
     selector: span[tracetest.span.type="rpc" name="grpc.oteldemo.PaymentService/Charge" rpc.system="grpc" rpc.method="Charge" rpc.service="oteldemo.PaymentService"]
     assertions:
-    - attr:rpc.grpc.status_code  =  2
     - attr:grpc.error_message = "Sorry, we cannot process amex credit cards. Only VISA or MasterCard is accepted."
+  - name: It should return a return an gRPC error code to the caller
+    selector: span[tracetest.span.type="general" name="Tracetest trigger"]
+    assertions:
+    - attr:tracetest.response.status = 2
diff --git a/test/tracetesting/tech-based-tests/payment-service/expired-credit-card.yaml b/test/tracetesting/tech-based-tests/payment-service/expired-credit-card.yaml
index 7cbb5700d2..fbd3272dc7 100644
--- a/test/tracetesting/tech-based-tests/payment-service/expired-credit-card.yaml
+++ b/test/tracetesting/tech-based-tests/payment-service/expired-credit-card.yaml
@@ -349,5 +349,8 @@ spec:
   - name: It should call Charge method and receive a gRPC error
     selector: span[tracetest.span.type="rpc" name="grpc.oteldemo.PaymentService/Charge" rpc.system="grpc" rpc.method="Charge" rpc.service="oteldemo.PaymentService"]
     assertions:
-    - attr:rpc.grpc.status_code  =  2
     - attr:grpc.error_message = "The credit card (ending 0454) expired on 1/2021."
+  - name: It should return a return an gRPC error code to the caller
+    selector: span[tracetest.span.type="general" name="Tracetest trigger"]
+    assertions:
+    - attr:tracetest.response.status = 2
diff --git a/test/tracetesting/tech-based-tests/payment-service/invalid-credit-card.yaml b/test/tracetesting/tech-based-tests/payment-service/invalid-credit-card.yaml
index 6ed9a0a98e..d776b52ab9 100644
--- a/test/tracetesting/tech-based-tests/payment-service/invalid-credit-card.yaml
+++ b/test/tracetesting/tech-based-tests/payment-service/invalid-credit-card.yaml
@@ -349,5 +349,8 @@ spec:
   - name: It should call Charge method and receive a gRPC error
     selector: span[tracetest.span.type="rpc" name="grpc.oteldemo.PaymentService/Charge" rpc.system="grpc" rpc.method="Charge" rpc.service="oteldemo.PaymentService"]
     assertions:
-    - attr:rpc.grpc.status_code  =  2
     - attr:grpc.error_message = "Credit card info is invalid."
+  - name: It should return a return an gRPC error code to the caller
+    selector: span[tracetest.span.type="general" name="Tracetest trigger"]
+    assertions:
+    - attr:tracetest.response.status = 2
diff --git a/test/tracetesting/tech-based-tests/payment-service/valid-credit-card.yaml b/test/tracetesting/tech-based-tests/payment-service/valid-credit-card.yaml
index 0cbe1b94dd..95874d0d7a 100644
--- a/test/tracetesting/tech-based-tests/payment-service/valid-credit-card.yaml
+++ b/test/tracetesting/tech-based-tests/payment-service/valid-credit-card.yaml
@@ -349,7 +349,7 @@ spec:
   - name: It should call Charge method successfully
     selector: span[tracetest.span.type="rpc" name="grpc.oteldemo.PaymentService/Charge" rpc.system="grpc" rpc.method="Charge" rpc.service="oteldemo.PaymentService"]
     assertions:
-    - attr:rpc.grpc.status_code  =  0
+    - attr:rpc.grpc.status_code = 0
   - name: It should return a transaction ID
     selector: span[tracetest.span.type="general" name="Tracetest trigger"]
     assertions: