diff --git a/run-tests.sh b/run-tests.sh
index facd04dd..93664965 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -59,6 +59,14 @@ check_commitlint () {
         commit_hash=$(echo "$line" | cut -d ' ' -f 1)
         commit_title=$(echo "$line" | cut -d ' ' -f 2-)
         commit_number_of_parents=$(git rev-list --parents "$commit_hash" -n1 | awk '{print NF-1}')
+        if [ "$commit_number_of_parents" -le 1 ] && echo "$commit_title" | grep -qP "^chore\(.*\): release"; then
+            # release commit generated by release-please, skip checks
+            continue
+        fi
+        if ! echo "$commit_title" | grep -qP "\(\#$pr\)$"; then
+            echo "✖   Headline does not end by '(#$pr)' PR number: $commit_title"
+            found=1
+        fi
         if [ "$commit_number_of_parents" -gt 1 ]; then
             if echo "$commit_title" | grep -qP "^chore\(.*\): merge "; then
                 break
@@ -66,13 +74,6 @@ check_commitlint () {
                 echo "✖   Merge commits are not allowed in feature branches: $commit_title"
                 found=1
             fi
-        elif echo "$commit_title" | grep -qP "^chore\(.*\): release"; then
-            true
-        elif echo "$commit_title" | grep -qP "\(\#$pr\)$"; then
-            true
-        else
-            echo "✖   Headline does not end by '(#$pr)' PR number: $commit_title"
-            found=1
         fi
     done < <(git log "$from..$to" --format="%H %s")
     if [ $found -gt 0 ]; then