Minor changes relating to CI modifications

17 files changed, 59 insertions, 79 deletions

diff --git a/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1040640.sh b/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1040640.sh
index eca9de24c..bb1deb0ec 100755
--- a/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1040640.sh
+++ b/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1040640.sh
@@ -43,7 +43,7 @@
 ########################################################################
 run_bug-1040640-verification(){
  
-     rlPhaseStartTest "Bug 1040640 -  Incorrect OIDs for SHA2 algorithms"
+     rlPhaseStartTest "Bug_1040640: Incorrect OIDs for SHA2 algorithms"
 	BUGCA_DOMAIN=`hostname -d`
 	pkcs10_cert_req_old="$BUGCA_CERTDB_DIR/certReq.p10"
 	pkcs10_cert_req_out_old="$BUGCA_CERTDB_DIR/certReq.p10.cmc"
diff --git a/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1133718.sh b/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1133718.sh
index 818c8cd0e..8b525999f 100755
--- a/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1133718.sh
+++ b/tests/dogtag/acceptance/bugzilla/jss-bugs/bug-1133718.sh
@@ -43,7 +43,7 @@
 ########################################################################
 run_bug-1133718-verification(){
  
-     rlPhaseStartTest "Bug 1133718 - Key strength validation is not performed for RC4 algorithm"
+     rlPhaseStartTest "Bug_1133718: Key strength validation is not performed for RC4 algorithm"
 	BUGCA_DOMAIN=`hostname -d`
 	rlLog "https://bugzilla.redhat.com/show_bug.cgi?id=1133718"
 	rlLog "pki -d $BUGCA_CERTDB_DIR -c $BUGCA_CERTDB_DIR_PASSWORD -n \"PKI Administrator for $BUGCA_DOMAIN\" -h $MASTER -p $BUGCA_HTTP_PORT key-generate test --key-algorithm RC4 --key-size -1"
diff --git a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-find-kra.sh b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-find-kra.sh
index f3d8f8a5d..c95a0c44c 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-find-kra.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-group-cli/pki-group-cli-group-member-find-kra.sh
@@ -56,7 +56,7 @@ run_pki-group-cli-group-member-find-kra_tests(){
         groupid7="Security Domain Administrators"
         groupid8="Enterprise KRA Administrators"
 
-	rlPhaseStartTest "pki_group_cli_group_member-find_kra-001: Create temporary directory"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-001: Create temporary directory"
                 rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
                 rlRun "pushd $TmpDir"
         rlPhaseEnd
@@ -83,7 +83,7 @@ local TEMP_NSS_DB_PASSWD="redhat123"
 local cert_info="$TmpDir/cert_info"
 
  
-        rlPhaseStartTest "pki_group_cli_group_member-find_kra-001: Find kra-group-member when user is added to different groups"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-002: Find kra-group-member when user is added to different groups"
                 i=1
                 while [ $i -lt 9 ] ; do
                        rlLog "pki -d $CERTDB_DIR \
@@ -141,7 +141,7 @@ local cert_info="$TmpDir/cert_info"
                 done
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-002: Find kra-group-member when the same user is added to many groups"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-003: Find kra-group-member when the same user is added to many groups"
                 rlRun "pki -d $CERTDB_DIR \
 			    -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -192,7 +192,7 @@ local cert_info="$TmpDir/cert_info"
                 done
         rlPhaseEnd
 	
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-003: Find kra-group-member when many users are added to one group"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-004: Find kra-group-member when many users are added to one group"
 		i=1
 		rlRun "pki -d $CERTDB_DIR \
 				    -n $(eval echo \$${subsystemId}_adminV_user) \
@@ -260,7 +260,7 @@ local cert_info="$TmpDir/cert_info"
                 done
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-004: Find group-member of a user from the 6th position (start=5)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-005: Find group-member of a user from the 6th position (start=5)"
 		rlRun "pki -d $CERTDB_DIR \
 			    -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -283,7 +283,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 9" "$TmpDir/pki-kra-group-member-find-groupadd-find-start-001.out"
 	rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-005: Find all group members of a group (start=0)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-006: Find all group members of a group (start=0)"
                 rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -303,7 +303,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 14" "$TmpDir/pki-kra-group-member-find-groupadd-find-start-002.out"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-006: Find group members when page start is negative (start=-1)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-007: Find group members when page start is negative (start=-1)"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=-1"
 		errmsg="--start option should have argument greater than 0"
 		errorcode=255
@@ -312,7 +312,7 @@ local cert_info="$TmpDir/cert_info"
 		rlLog "FAIL: https://fedorahosted.org/pki/ticket/929"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-007: Find group members when page start greater than available number of groups (start=15)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-008: Find group members when page start greater than available number of groups (start=15)"
 		rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -326,14 +326,14 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 0" "$TmpDir/pki-kra-group-member-find-groupadd-find-start-004.out"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-008: Should not be able to find group members when page start is non integer"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-009: Should not be able to find group members when page start is non integer"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=a"
 		errmsg="NumberFormatException: For input string: \"a\""
 		errorcode=255
 		rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group members when page start is non integer"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-009: Find group member when page size is 0 (size=0)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-010: Find group member when page size is 0 (size=0)"
 		rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -346,7 +346,7 @@ local cert_info="$TmpDir/cert_info"
 		rlAssertGrep "Number of entries returned 0" "$TmpDir/pki-kra-group-member-find-groupadd-find-size-006.out"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-010: Find group members when page size is 1 (size=1)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-011: Find group members when page size is 1 (size=1)"
 		rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -360,7 +360,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 1" "$TmpDir/pki-kra-group-member-find-groupadd-find-size-007.out"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-011: Find group members when page size is 15 (size=15)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-012: Find group members when page size is 15 (size=15)"
                 rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -379,7 +379,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 14" "$TmpDir/pki-kra-group-member-find-groupadd-find-size-009.out"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-012: Find group members when page size greater than available number of groups (size=100)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-013: Find group members when page size greater than available number of groups (size=100)"
 		rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -398,7 +398,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 14" "$TmpDir/pki-kra-group-member-find-groupadd-find-size-0010.out"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-013: Find group-member when page size is negative (size=-1)"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-014: Find group-member when page size is negative (size=-1)"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --size=-1"
 		errmsg="--size option should have argument greater than 0"
 		errorcode=255
@@ -406,14 +406,14 @@ local cert_info="$TmpDir/cert_info"
 		rlLog "FAIL: https://fedorahosted.org/pki/ticket/861"
         rlPhaseEnd
 
-        rlPhaseStartTest "pki_group_cli_group_member-find-kra-014: Should not be able to find group members when page size is non integer"
+        rlPhaseStartTest "pki_group_cli_group_member-find-kra-015: Should not be able to find group members when page size is non integer"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --size=a"
 		errmsg="NumberFormatException: For input string: \"a\""
 		errorcode=255
 		rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "String cannot be used as input to size parameter "
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-015: Find group members with -t option"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-016: Find group members with -t option"
 		rlLog "Executing: pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -440,7 +440,7 @@ local cert_info="$TmpDir/cert_info"
         	rlAssertGrep "Number of entries returned 5" "$TmpDir/pki-kra-group-member-find-018.out"
 	rlPhaseEnd		
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-016: Find group members with page start and page size option"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-017: Find group members with page start and page size option"
 		rlLog "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -467,7 +467,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "Number of entries returned 5" "$TmpDir/pki-kra-group-member-find-019.out"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-017: Find group members with --size more than maximum possible value"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-018: Find group members with --size more than maximum possible value"
 		randhex=$(openssl rand -hex 12 |  perl -p -e 's/\n//')
         	randhex_covup=${randhex^^}
 	        maximum_check=$(echo "ibase=16;$randhex_covup"|bc)
@@ -477,7 +477,7 @@ local cert_info="$TmpDir/cert_info"
 		rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "An exception should be thrown if size has a value greater than the maximum possible"
 	rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-018: Find  group members with --start more than maximum possible value"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-019: Find  group members with --start more than maximum possible value"
 		randhex=$(openssl rand -hex 12 |  perl -p -e 's/\n//')
         	randhex_covup=${randhex^^}
 	        maximum_check=$(echo "ibase=16;$randhex_covup"|bc)
@@ -487,7 +487,7 @@ local cert_info="$TmpDir/cert_info"
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "An exception should be thrown if start has a value greater than the maximum possible"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-019: Should not be able to group-member-find using a revoked cert KRA_adminR"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-020: Should not be able to group-member-find using a revoked cert KRA_adminR"
                 command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminR_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
 		errmsg="PKIException: Unauthorized"
 		errorcode=255
@@ -496,7 +496,7 @@ local cert_info="$TmpDir/cert_info"
 	        rlLog "PKI Ticket: https://fedorahosted.org/pki/ticket/1182"
 	rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-020: Should not be able to group-member-find using an agent with revoked cert KRA_agentR"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-021: Should not be able to group-member-find using an agent with revoked cert KRA_agentR"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_agentR_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
 		errmsg="PKIException: Unauthorized"
                 errorcode=255
@@ -505,14 +505,14 @@ local cert_info="$TmpDir/cert_info"
 	        rlLog "PKI Ticket: https://fedorahosted.org/pki/ticket/1182"
 	rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-021: Should not be able to group-member-find using a valid agent KRA_agentV user"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-022: Should not be able to group-member-find using a valid agent KRA_agentV user"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_agentV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group members using a valid agent KRA_agentV user cert"
 	rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-022: Should not be able to group-member-find using admin user with expired cert KRA_adminE"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-023: Should not be able to group-member-find using admin user with expired cert KRA_adminE"
 		rlRun "date --set='+2 days'" 0 "Set System date 2 days ahead"
        		rlRun "date"
 		command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminE_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
@@ -523,7 +523,7 @@ local cert_info="$TmpDir/cert_info"
 		rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 	rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-023: Should not be able to group-member-find using KRA_agentE cert"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-024: Should not be able to group-member-find using KRA_agentE cert"
 		rlRun "date --set='+2 days'" 0 "Set System date 2 days ahead"
                 rlRun "date"
                 command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_agentE_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
@@ -534,28 +534,28 @@ local cert_info="$TmpDir/cert_info"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-024: Should not be able to group-member-find using KRA_auditV cert"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-025: Should not be able to group-member-find using KRA_auditV cert"
                 command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_auditV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group-member using a valid auditor KRA_auditV user cert"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-025: Should not be able to group-member-find using KRA_operatorV cert"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-026: Should not be able to group-member-find using KRA_operatorV cert"
                 command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_operatorV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group-members using a valid operator KRA_operatorV user cert"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-026: Should not be able to group-member-find using role_user_UTCA cert"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-027: Should not be able to group-member-find using role_user_UTCA cert"
                 command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n role_user_UTCA -c $UNTRUSTED_CERT_DB_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
                 errmsg="PKIException: Unauthorized"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group-member using a untrusted CA_adminUTCA user cert"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-027: Should not be able to group-member-find using role_user_UTCA cert"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-028: Should not be able to group-member-find using role_user_UTCA cert"
                 command="pki -d $UNTRUSTED_CERT_DB_LOCATION -n role_user_UTCA -c $UNTRUSTED_CERT_DB_PASSWORD -h $KRA_HOST -p $KRA_PORT -t kra group-member-find group1 --start=0 --size=5"
                 errmsg="PKIException: Unauthorized"
                 errorcode=255
@@ -563,7 +563,7 @@ local cert_info="$TmpDir/cert_info"
 		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
         rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-028:Find group-member for group id with i18n characters"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-029:Find group-member for group id with i18n characters"
                 rlLog "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
                     -c $CERTDB_DIR_PASSWORD \
@@ -625,7 +625,7 @@ local cert_info="$TmpDir/cert_info"
                 rlAssertGrep "User: u9" "$TmpDir/pki-kra-group-member-find-groupadd-find-031_3.out"	
 	rlPhaseEnd
 
-	rlPhaseStartTest "pki_group_cli_group_member-find-kra-029: Find group-member - paging"
+	rlPhaseStartTest "pki_group_cli_group_member-find-kra-030: Find group-member - paging"
                 i=1
                 rlRun "pki -d $CERTDB_DIR \
 			   -n $(eval echo \$${subsystemId}_adminV_user) \
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-add.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-add.sh
index bed90c6d9..7fb1e0327 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-add.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-add.sh
@@ -347,7 +347,7 @@ local TEMP_NSS_DB_PASSWD="redhat123"
 	errmsg="ForbiddenException: Authorization Error"
 	errorcode=255
 	rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Add Group -- using an expired admin cert KRA_adminE"
-        rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+        rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
 	rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
     rlPhaseEnd
 
@@ -359,7 +359,7 @@ local TEMP_NSS_DB_PASSWD="redhat123"
 	errmsg="ForbiddenException: Authorization Error"
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Add Group -- using an expired agent cert KRA_agentE"
-        rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+        rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
 	rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
     rlPhaseEnd
 
@@ -369,7 +369,6 @@ local TEMP_NSS_DB_PASSWD="redhat123"
 	errmsg="ForbiddenException: Authorization Error"
 	errorcode=255
 	rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Add Group -- using a valid auditor cert KRA_auditorV"
-	rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
     rlPhaseEnd
 
 	##### Tests to add groups using operator user###
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh
index ee475459e..1a7068526 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-del.sh
@@ -388,7 +388,7 @@ ROOTCA_agent_user=${caId}_agentV
 	rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Should not be able to delete group g3 using an expired admin cert"
 	#Set datetime back on original
         rlRun "date --set='-2 days'" 0 "Set System back to the present day"
-	rlLog "PKI TICKET :: https://engineering.redhat.com/trac/pki-tests/ticket/962"
+	rlLog "PKI TICKET :: https://fedorahosted.org/pki/ticket/934"
 	#Make sure group is not deleted
 	rlRun "pki -d $CERTDB_DIR \
 		   -n $(eval echo \$${subsystemId}_adminV_user) \
@@ -411,7 +411,7 @@ ROOTCA_agent_user=${caId}_agentV
 	errorcode=255
 	rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Should not be able to delete group g3 using a agent cert"
 
-        rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+        rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
 	rlRun "date --set='-2 days'" 0 "Set System back to the present day"
 	#Make sure group is not deleted
 	rlRun "pki -d $CERTDB_DIR \
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh
index 498d95496..604696476 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-find.sh
@@ -404,7 +404,7 @@ local cert_info="$TmpDir/cert_info"
 	errorcode=255
 	rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Should not be able to find groups using a expired admin cert"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
     rlPhaseEnd
 
     rlPhaseStartTest "pki_kra_group_cli_kra_group_find-025: Should not be able to find groups using KRA_agentE cert"
@@ -416,7 +416,7 @@ local cert_info="$TmpDir/cert_info"
 	errorcode=255
 	rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Should not be able to find groups using a expired agent cert"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
     rlPhaseEnd
 
      rlPhaseStartTest "pki_kra_group_cli_kra_group_find-026: Should not be able to find groups using a KRA_auditV"
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh
index 5a96f28e6..02023d53d 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-add.sh
@@ -363,7 +363,7 @@ ROOTCA_agent_user=${caId}_agentV
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to kra-group-member-add using admin user with expired cert CA_adminE"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
         rlPhaseEnd
 
@@ -374,7 +374,7 @@ ROOTCA_agent_user=${caId}_agentV
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to kra-group-member-add using KRA_agentE cert"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
         rlPhaseEnd
 
@@ -404,7 +404,6 @@ ROOTCA_agent_user=${caId}_agentV
                 errmsg="PKIException: Unauthorized"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to kra-group-member-add using KRA_agentUTCA cert"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
 	rlPhaseEnd
 
 	#Usability tests
@@ -460,7 +459,7 @@ ROOTCA_agent_user=${caId}_agentV
 		errorcode=255
 		rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "kra-user-add operation should fail when authenticating using a user cert"
 
-		rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+		rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
 
 		#Add testuser1 to Administrators group
 		rlRun "pki -d $CERTDB_DIR \
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh
index 661633726..6abe812dc 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-del.sh
@@ -310,7 +310,7 @@ ROOTCA_agent_user=${caId}_agentV
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to kra-group-member-del using admin user with expired cert KRA_adminE"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 	rlPhaseEnd
 
@@ -321,7 +321,7 @@ ROOTCA_agent_user=${caId}_agentV
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to kra-group-member-del using KRA_agentE cert"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 	rlPhaseEnd
 
@@ -351,7 +351,6 @@ ROOTCA_agent_user=${caId}_agentV
                 errmsg="PKIException: Unauthorized"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to kra-group-member-del using role_user_UTCA cert"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
 	rlPhaseEnd
 
 	rlPhaseStartTest "pki_kra_group_cli_kra_group_member-del-017: Delete kra-group-member for user id with i18n characters"
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh
index 79c930a5f..1f679d249 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-find.sh
@@ -517,7 +517,7 @@ local cert_info="$TmpDir/cert_info"
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find kra-group-member using a expired admin CA_adminE user cert"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
 		rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 	rlPhaseEnd
 
@@ -528,7 +528,7 @@ local cert_info="$TmpDir/cert_info"
                 errmsg="ForbiddenException: Authorization Error"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group-member using a expired agent KRA_agentE user cert"
-                rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
+                rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
         rlPhaseEnd
 
@@ -558,7 +558,6 @@ local cert_info="$TmpDir/cert_info"
                 errmsg="PKIException: Unauthorized"
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Should not be able to find group-member using a untrusted KRA_agentUTCA user cert"
-		rlLog "PKI Ticket::  https://fedorahosted.org/pki/ticket/962"
         rlPhaseEnd
 
 	rlPhaseStartTest "pki_kra_group_cli_kra_group_member-find-031:Find group-member for group id with i18n characters"
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh
index 7100a29ed..19b9adcab 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-member-show.sh
@@ -230,7 +230,7 @@ ROOTCA_agent_user=${caId}_agentV
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Should not be able to show group members using an expired admin cert"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
-	rlLog "PKI TICKET :: https://engineering.redhat.com/trac/pki-tests/ticket/962"
+	rlLog "PKI TICKET :: https://fedorahosted.org/pki/ticket/934"
     rlPhaseEnd
 
     rlPhaseStartTest "pki_kra_group_cli_kra_group_member_show-012: Should not be able to show group members using KRA_agentE cert"
@@ -242,7 +242,7 @@ ROOTCA_agent_user=${caId}_agentV
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Should not be able to show group members g7 using a agent cert"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
-	rlLog "PKI TICKET :: https://engineering.redhat.com/trac/pki-tests/ticket/962"
+	rlLog "PKI TICKET :: https://fedorahosted.org/pki/ticket/934"
     rlPhaseEnd
 
     rlPhaseStartTest "pki_kra_group_cli_kra_group_member_show-013: Should not be able to show group members using a KRA_auditV"
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-mod.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-mod.sh
index 14ee03e76..77d4a9478 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-mod.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-mod.sh
@@ -125,7 +125,6 @@ local TEMP_NSS_DB_PASSWD="redhat123"
         rlAssertGrep "Modified group \"$group1\"" "$TmpDir/pki-kra-group-mod-002.out"
         rlAssertGrep "Group ID: $group1" "$TmpDir/pki-kra-group-mod-002.out"
         rlAssertGrep "Description: $group1_mod_description" "$TmpDir/pki-kra-group-mod-002.out"
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
 
 
@@ -153,7 +152,6 @@ rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-003:--description with charact
         rlAssertGrep "Modified group \"g1\"" "$TmpDir/pki-kra-group-mod-004.out"
         rlAssertGrep "Group ID: g1" "$TmpDir/pki-kra-group-mod-004.out"
         rlAssertGrep "Description: abcdefghijklmnopqrstuvwxyx12345678" "$TmpDir/pki-kra-group-mod-004.out"
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
 
 	rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-004:--description with maximum length and symbols "
@@ -189,7 +187,6 @@ rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-003:--description with charact
         else
                 rlFail "$expected_group_string not found"
         fi
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
 
     rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-005:--description with $ character "
@@ -216,7 +213,6 @@ rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-003:--description with charact
         rlAssertGrep "Modified group \"g3\"" "$TmpDir/pki-kra-group-mod-008.out"
         rlAssertGrep "Group ID: g3" "$TmpDir/pki-kra-group-mod-008.out"
         rlAssertGrep "Description: \\$" "$TmpDir/pki-kra-group-mod-008.out"
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
 
 
@@ -247,7 +243,6 @@ rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-003:--description with charact
         rlAssertGrep "Modified group \"g4\"" "$TmpDir/pki-kra-group-mod-007.out"
         rlAssertGrep "Group ID: g4" "$TmpDir/pki-kra-group-mod-007.out"
         rlAssertGrep "Description: $group1desc" "$TmpDir/pki-kra-group-mod-007.out"
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
     rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-007:  Modify a group -- missing required option group id"
 	command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD -h $KRA_HOST -p $KRA_PORT kra-group-mod --description='$group1desc'"
@@ -384,7 +379,6 @@ rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-016:  Modify a group -- Group
 	rlAssertGrep "Modified group \"$group1\"" "$TmpDir/pki-kra-group-mod-041_2.out"
         rlAssertGrep "Group ID: $group1" "$TmpDir/pki-kra-group-mod-041_2.out"
         rlAssertGrep "Description: $group1_mod_description" "$TmpDir/pki-kra-group-mod-041_2.out"
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
 
 ##### Tests to modify KRA groups having i18n chars in the description ####
@@ -413,7 +407,6 @@ rlPhaseStartTest "pki_kra_group_cli_kra_group_mod-019: Modify a groups's descrip
         rlAssertGrep "Modified group \"$i18ngroup\"" "$TmpDir/pki-kra-group-mod-043.out"
         rlAssertGrep "Group ID: $i18ngroup" "$TmpDir/pki-kra-group-mod-043.out"
         rlAssertGrep "Description: $i18ngroup_mod_description" "$TmpDir/pki-kra-group-mod-043.out"
-	rlLog "PKI TICKET: https://fedorahosted.org/pki/ticket/818"
     rlPhaseEnd
 
 ##### Tests to modify system generated KRA groups ####
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh
index 5c7cfd330..671af75c8 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-group-cli/pki-kra-group-cli-kra-group-show.sh
@@ -553,7 +553,7 @@ local cert_info="$TmpDir/cert_info"
                     kra-group-show g7 >  $TmpDir/pki-kra-group-show-pkiUser1-0025.out 2>&1" 255 "Should not be able to find groups using a user cert"
 
         rlAssertGrep "PKIException: Unauthorized" "$TmpDir/pki-kra-group-show-pkiUser1-0025.out"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
     rlPhaseEnd
 
     rlPhaseStartTest "pki_kra_group_cli_kra_group_show-026: group id length exceeds maximum limit defined in the schema"
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh
index 383feda89..f9653622a 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-add.sh
@@ -94,7 +94,6 @@ ROOTCA_agent_user=${caId}_agentV
         rlAssertGrep "--input <file>             Input file" "$TmpDir/pki_kra_user_cert_add_cfg.out"
 	rlAssertGrep "--serial <serial number>   Serial number of certificate in CA" "$TmpDir/pki_kra_user_cert_add_cfg.out"
 	rlAssertGrep "--help                     Show help options" "$TmpDir/pki_kra_user_cert_add_cfg.out"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/843"
     rlPhaseEnd
 
 	##### Tests to add certs to KRA users ####
@@ -1445,7 +1444,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-add-0022: Adding a cert as CA_a
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Adding cert to a user as an expired admin cert"
 
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 rlPhaseEnd
 
@@ -1591,7 +1590,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-add-0025: Adding a cert as agen
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Adding cert to a user as an agent user with expired cert"
 
-        rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+        rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 rlPhaseEnd
 
@@ -1639,7 +1638,6 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-add-0026: Adding a cert as role
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Adding cert to a user as KRA_adminUTCA"
 	
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
 rlPhaseEnd
 
 ##### Adding a cert as KRA_agentUTCA #####
@@ -1686,7 +1684,6 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-add-0027: Adding a cert as KRA_
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - Adding cert to a user KRA_agentUTCA"
 
-        rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
 rlPhaseEnd
 
 ##### Adding a cert as an KRA_operatorV #####
@@ -1779,7 +1776,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-add-0029: Adding a cert as user
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message -  Adding cert to $userid as a user not associated with any group"
 
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
 rlPhaseEnd
 
 ##### Add one cert to a user - switching position of options #####
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh
index b2e508171..f6c85280d 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-delete.sh
@@ -92,7 +92,6 @@ ROOTCA_agent_user=${caId}_agentV
                 "User cert delete configuration"
         rlAssertGrep "usage: kra-user-cert-del <User ID> <Cert ID>" "$TmpDir/pki_kra_user_cert_del_cfg.out"
 	rlAssertNotGrep "Error: Unrecognized option: --help" "$TmpDir/pki_kra_user_cert_del_cfg.out"
-	rlLog "FAIL:https://fedorahosted.org/pki/ticket/843"
     rlPhaseEnd
 
 	##### Tests to delete certs assigned to KRA users ####
@@ -372,7 +371,6 @@ ROOTCA_agent_user=${caId}_agentV
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using a valid auditor cert"
 
-		rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
 	rlPhaseEnd
 
 	##### Delete certs asigned to a user - as KRA_adminE ##### 
@@ -395,7 +393,7 @@ ROOTCA_agent_user=${caId}_agentV
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an expired admin cert"
 		rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 
-                rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+                rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
 	rlPhaseEnd
 
 	 ##### Delete certs asigned to a user - as KRA_agentE ##### 
@@ -418,7 +416,7 @@ ROOTCA_agent_user=${caId}_agentV
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-del should fail if authenticating using an expired agent cert"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
 
-                rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+                rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
         rlPhaseEnd
 
 	 ##### Delete certs asigned to a user - as KRA_adminR ##### 
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh
index 6cd5c3afa..14392ec5e 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-find.sh
@@ -96,7 +96,6 @@ ca_signing_cert_subj_name=$(eval echo \$${caId}_SIGNING_CERT_SUBJECT_NAME)
         rlAssertGrep "--size <size>     Page size" "$TmpDir/pki_kra_user_cert_find_cfg.out"
         rlAssertGrep "--start <start>   Page start" "$TmpDir/pki_kra_user_cert_find_cfg.out"
 	rlAssertNotGrep "Error: Unrecognized option: --help" "$TmpDir/pki_kra_user_cert_find_cfg.out"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/843"
     rlPhaseEnd
 
      ##### Find certs assigned to a CA user - with userid argument - this user has only a single page of certs ####
@@ -554,7 +553,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-find-0013: Find the certs of a
         errmsg="The value for size shold be greater than or equal to 0"
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - the value for --start should not be less than 0"
-        rlLog "FAIL: https://fedorahosted.org/pki/ticket/861"
+        rlLog "FAIL: https://fedorahosted.org/pki/ticket/929"
 rlPhaseEnd
 
 ##### Find certs assigned to a KRA user - with --start=50 ####
@@ -956,7 +955,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-find-025: Find the certs of a u
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - kra-user-cert-find should fail when authenticated as an admin user with an expired cert"
 	rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
 rlPhaseEnd
 
 #### Find certs assigned to a KRA user - authenticating as an admin user with revoked cert  ###
@@ -992,7 +991,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-find-028: Find the certs of a u
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - kra-user-cert-find should fail when authenticated as an agent user with an expired cert"
         rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
 rlPhaseEnd
 
 #### Find certs assigned to a KRA user - authenticating as a user whose KRA cert has not been trusted ###
@@ -1020,7 +1019,7 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_cert-find-031: Find the certs of a u
         errmsg="ForbiddenException: Authorization Error"
         errorcode=255
         rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - kra-user-cert-find should fail when authenticated as a user not assigned to any role"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+	rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
 rlPhaseEnd
 
 #### Find certs assigned to a KRA user - userid is missing ###
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh
index de156e213..c35b201b1 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-cert-show.sh
@@ -95,7 +95,6 @@ ca_signing_cert_subj_name=$(eval echo \$${caId}_SIGNING_CERT_SUBJECT_NAME)
         rlAssertGrep "--output <file>   Output file" "$TmpDir/pki_kra_user_cert_show_cfg.out"
 	rlAssertGrep "--pretty          Pretty print" "$TmpDir/pki_kra_user_cert_show_cfg.out"
 	rlAssertNotGrep "Error: Unrecognized option: --help" "$TmpDir/pki_kra_user_cert_show_cfg.out"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/843"
     rlPhaseEnd
 
 	##### Tests to find certs assigned to KRA users ####
@@ -758,7 +757,7 @@ ca_signing_cert_subj_name=$(eval echo \$${caId}_SIGNING_CERT_SUBJECT_NAME)
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-show should fail when authenticating with an expired admin cert"
 
-		rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+		rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
         rlPhaseEnd
 
@@ -778,7 +777,7 @@ ca_signing_cert_subj_name=$(eval echo \$${caId}_SIGNING_CERT_SUBJECT_NAME)
                 errorcode=255
                 rlRun "verifyErrorMsg \"$command\" \"$errmsg\" \"$errorcode\"" 0 "Verify expected error message - pki kra-user-cert-show should fail when authenticating with an expired agent cert"
 
-                rlLog "FAIL: https://fedorahosted.org/pki/ticket/962"
+                rlLog "FAIL: https://fedorahosted.org/pki/ticket/934"
                 rlRun "date --set='2 days ago'" 0 "Set System back to the present day"
         rlPhaseEnd
 
diff --git a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-mod.sh b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-mod.sh
index 6260bb5a3..deed0d4d2 100755
--- a/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-mod.sh
+++ b/tests/dogtag/acceptance/cli-tests/pki-kra-user-cli/pki-kra-user-cli-kra-user-mod.sh
@@ -896,7 +896,6 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_mod-034: Modify a user -- User ID do
         rlAssertGrep "State: $state" "$TmpDir/pki-kra-user-mod-039_1.out"
 	command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD  -h $KRA_HOST -p $KRA_PORT kra-user-mod --phone=\"\" u16"
 	rlRun "$command" 0 "Successfully updated phone to empty value"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/836"
     rlPhaseEnd
 
 	#### Modify a user - state option is empty ####
@@ -914,7 +913,6 @@ rlPhaseStartTest "pki_kra_user_cli_kra_user_mod-034: Modify a user -- User ID do
         rlAssertGrep "State: $state" "$TmpDir/pki-kra-user-mod-040_1.out"
 	command="pki -d $CERTDB_DIR -n $(eval echo \$${subsystemId}_adminV_user) -c $CERTDB_DIR_PASSWORD  -h $KRA_HOST -p $KRA_PORT kra-user-mod --state=\"\" u16"
 	rlRun "$command" 0 "Successfully updated phone to empty value"
-	rlLog "FAIL: https://fedorahosted.org/pki/ticket/836"
     rlPhaseEnd