diff --git a/tests/aaf/certservice/cert-service-test.robot b/tests/aaf/certservice/cert-service-test.robot
index 90ee1a3..ddf7a17 100644
--- a/tests/aaf/certservice/cert-service-test.robot
+++ b/tests/aaf/certservice/cert-service-test.robot
@@ -48,15 +48,40 @@
     [Documentation]  Send request to ${CERT_SERVICE_ENDPOINT}${CLIENT_CA_NAME} endpoint and expect 400
     Send Get Request with Header And Expect Error  ${CERT_SERVICE_ENDPOINT}${CLIENT_CA_NAME}  ${VALID_CLIENT_CSR_FILE}  ${INVALID_PK_FILE}  400
 
-Cert Service Client successfully creates keystore and truststore
+Cert Service Client successfully creates keystore.p12 and truststore.p12
     [Tags]      AAF-CERT-SERVICE
     [Documentation]  Run with correct env and expected exit code 0
-    Run Cert Service Client And Validate JKS File Creation And Client Exit Code  ${VALID_ENV_FILE}  0
+    Run Cert Service Client And Validate PKCS12 File Creation And Client Exit Code  ${VALID_ENV_FILE}  0
 
-Cert Service Client successfully creates keystore and truststore with expected data
+Cert Service Client successfully creates keystore.jks and truststore.jks
+    [Tags]      AAF-CERT-SERVICE
+    [Documentation]  Run with correct env and expected exit code 0
+    Run Cert Service Client And Validate JKS File Creation And Client Exit Code  ${VALID_ENV_FILE_JKS}  0
+
+Cert Service Client successfully creates keystore and truststore with expected data with no OUTPUT_TYPE
+    [Tags]      AAF-CERT-SERVICE
+    [Documentation]  Run with correct env and PKCS12 files created with correct data
+    Run Cert Service Client And Validate PKCS12 Files Contain Expected Data  ${VALID_ENV_FILE}  0
+
+Cert Service Client successfully creates keystore and truststore with expected data with OUTPUT_TYPE=JKS
     [Tags]      AAF-CERT-SERVICE
     [Documentation]  Run with correct env and JKS files created with correct data
-    Run Cert Service Client And Validate JKS Files Contain Expected Data  ${VALID_ENV_FILE}  0
+    Run Cert Service Client And Validate JKS Files Contain Expected Data  ${VALID_ENV_FILE_JKS}  0
+
+Cert Service Client successfully creates keystore and truststore with expected data with OUTPUT_TYPE=P12
+    [Tags]      AAF-CERT-SERVICE
+    [Documentation]  Run with correct env and PKCS12 files created with correct data
+    Run Cert Service Client And Validate PKCS12 Files Contain Expected Data  ${VALID_ENV_FILE_P12}  0
+
+Cert Service Client successfully creates keystore and truststore with expected data with OUTPUT_TYPE=PEM
+    [Tags]      AAF-CERT-SERVICE
+    [Documentation]  Run with correct env and PEM files created with correct data
+    Run Cert Service Client And Validate PEM Files Contain Expected Data  ${VALID_ENV_FILE_PEM}  0
+
+Cert Service Client reports error when OUTPUT_TYPE is invalid
+    [Tags]      AAF-CERT-SERVICE
+    [Documentation]  Run with invalid OUTPUT_TYPE env and expected exit code 1
+    Run Cert Service Client And Validate Client Exit Code  ${INVALID_ENV_FILE_OUTPUT_TYPE}  1
 
 Run Cert Service Client Container And Validate Exit Code And API Response
     [Tags]      AAF-CERT-SERVICE