diff --git a/easyrsa3/easyrsa b/easyrsa3/easyrsa
index 1b272cca..a20cb9f8 100755
--- a/easyrsa3/easyrsa
+++ b/easyrsa3/easyrsa
@@ -3171,7 +3171,7 @@ issued certificate:${NL}
 		# Revoking an issued cert forces req/key to be moved
 		move_req_and_key=1
 	;;
-	expired|renewed)
+	expired|renewed/issued)
 		# Revoke-expired/renewed cert means req/key can remain
 		move_req_and_key=
 	;;
@@ -5861,7 +5861,7 @@ case "$cmd" in
 		;;
 	revoke-renewed)
 		verify_working_env
-		cert_dir=renewed
+		cert_dir=renewed/issued
 		revoke "$@"
 		;;
 	renew)