diff --git a/tests/bugs/gh_6797_test.py b/tests/bugs/gh_6797_test.py
index f58b19d5..1b357a44 100644
--- a/tests/bugs/gh_6797_test.py
+++ b/tests/bugs/gh_6797_test.py
@@ -3,13 +3,16 @@
 """
 ID:          issue-6797
 ISSUE:       6797
-TITLE:       Functions DECRYPT and RSA_DECRYPT return VARCHAR CHARACTER SET NONE instead
-  of VARBINARY (VARCHAR CHARACTER SET OCTETS)
+TITLE:       Functions DECRYPT and RSA_DECRYPT return VARCHAR CHARACTER SET NONE instead of VARBINARY (VARCHAR) CHARACTER SET OCTETS
 DESCRIPTION:
-NOTES:
-  As of current FB 4.x doc, following is wrong: "Functions return ... *varbinary* for all other types."
-  (see note by Alex in the tracker, 11.05.2021 11:17).
+    As of current FB 4.x doc, following is wrong: "Functions return ... *varbinary* for all other types."
+    (see note by Alex in the tracker, 11.05.2021 11:17).
 FBTEST:      bugs.gh_6797
+NOTES:
+    [13.12.2023] pzotov
+        Added 'SQLSTATE' in substitutions: runtime error must not be filtered out by '?!(...)' pattern
+        ("negative lookahead assertion", see https://docs.python.org/3/library/re.html#regular-expression-syntax).
+        Added 'combine_output = True' in order to see SQLSTATE if any error occurs.
 """
 
 import pytest
@@ -28,7 +31,7 @@ test_script = """
     from rdb$database;
 """
 
-act = isql_act('db', test_script, substitutions=[('^((?!(sqltype)).)*$', ''), ('[ \t]+', ' ')])
+act = isql_act('db', test_script, substitutions=[('^((?!(SQLSTATE|sqltype)).)*$', ''), ('[ \t]+', ' ')])
 
 expected_stdout = """
     01: sqltype: 448 VARYING scale: 0 subtype: 0 len: 1 charset: 1 OCTETS
@@ -38,5 +41,5 @@ expected_stdout = """
 @pytest.mark.version('>=4.0')
 def test_1(act: Action):
     act.expected_stdout = expected_stdout
-    act.execute()
+    act.execute(combine_output = True)
     assert act.clean_stdout == act.clean_expected_stdout