diff --git a/test/tracetesting/paymentservice/all.yaml b/test/tracetesting/payment/all.yaml
similarity index 67%
rename from test/tracetesting/paymentservice/all.yaml
rename to test/tracetesting/payment/all.yaml
index e295034dce..c7d08d8944 100644
--- a/test/tracetesting/paymentservice/all.yaml
+++ b/test/tracetesting/payment/all.yaml
@@ -3,9 +3,9 @@
 
 type: TestSuite
 spec:
-  id: payment-service-all
-  name: 'Payment Service'
-  description: Run all Payment Service tests enabled in sequence
+  id: payment-all
+  name: 'Payment'
+  description: Run all Payment tests enabled in sequence
   steps:
   - ./valid-credit-card.yaml
   - ./invalid-credit-card.yaml
diff --git a/test/tracetesting/paymentservice/amex-credit-card-not-allowed.yaml b/test/tracetesting/payment/amex-credit-card-not-allowed.yaml
similarity index 100%
rename from test/tracetesting/paymentservice/amex-credit-card-not-allowed.yaml
rename to test/tracetesting/payment/amex-credit-card-not-allowed.yaml
diff --git a/test/tracetesting/paymentservice/expired-credit-card.yaml b/test/tracetesting/payment/expired-credit-card.yaml
similarity index 100%
rename from test/tracetesting/paymentservice/expired-credit-card.yaml
rename to test/tracetesting/payment/expired-credit-card.yaml
diff --git a/test/tracetesting/paymentservice/invalid-credit-card.yaml b/test/tracetesting/payment/invalid-credit-card.yaml
similarity index 100%
rename from test/tracetesting/paymentservice/invalid-credit-card.yaml
rename to test/tracetesting/payment/invalid-credit-card.yaml
diff --git a/test/tracetesting/paymentservice/valid-credit-card.yaml b/test/tracetesting/payment/valid-credit-card.yaml
similarity index 100%
rename from test/tracetesting/paymentservice/valid-credit-card.yaml
rename to test/tracetesting/payment/valid-credit-card.yaml