diff --git a/tests/testflows/map_type/regression.py b/tests/testflows/map_type/regression.py
index 930f0365678..54d713347c6 100755
--- a/tests/testflows/map_type/regression.py
+++ b/tests/testflows/map_type/regression.py
@@ -26,8 +26,16 @@ xfails = {
         [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21029")],
     "tests/mapcontains/null key in map":
         [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapcontains/null key not in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapkeys/null key not in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
+    "tests/mapkeys/null key in map":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21028")],
     "tests/mapcontains/select nullable key":
         [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
+    "tests/mapkeys/select keys from column":
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
     "tests/table map select key with value string/LowCardinality:":
         [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
     "tests/table map select key with key string/FixedString":
@@ -45,7 +53,41 @@ xfails = {
     "tests/table map select key with key integer/toNullable":
         [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21406")],
     "tests/table map select key with key integer/toNullable(NULL)":
-        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")]
+        [(Fail, "https://github.com/ClickHouse/ClickHouse/issues/21026")],
+    "tests/select map with key integer/Int128":
+        [(Fail, "large Int128 as key not supported")],
+    "tests/select map with key integer/Int256":
+        [(Fail, "large Int256 as key not supported")],
+    "tests/select map with key integer/UInt256":
+        [(Fail, "large UInt256 as key not supported")],
+    "tests/select map with key integer/toNullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/select map with key integer/toNullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/select map with key string/Nullable":
+        [(Fail, "Nullable type as key not supported")],   
+    "tests/select map with key string/Nullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map queries/select map with nullable value":
+        [(Fail, "Nullable value not supported")],
+    "tests/table map with key integer/toNullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key integer/toNullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key string/Nullable":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key string/Nullable(NULL)":
+        [(Fail, "Nullable type as key not supported")],
+    "tests/table map with key string/LowCardinality(String)":
+        [(Fail, "LowCardinality(String) as key not supported")],
+    "tests/table map with key string/LowCardinality(String) cast from String":
+        [(Fail, "LowCardinality(String) as key not supported")],
+    "tests/table map with key string/LowCardinality(String) for key and value":
+        [(Fail, "LowCardinality(String) as key not supported")],
+    "tests/table map with key string/LowCardinality(FixedString)":
+        [(Fail, "LowCardinality(FixedString) as key not supported")],
+    "tests/table map with value string/LowCardinality(String) for key and value":
+        [(Fail, "LowCardinality(String) as key not supported")],
 }
 
 xflags = {
diff --git a/tests/testflows/map_type/tests/feature.py b/tests/testflows/map_type/tests/feature.py
index ea8fb64d0eb..5fd48844825 100755
--- a/tests/testflows/map_type/tests/feature.py
+++ b/tests/testflows/map_type/tests/feature.py
@@ -408,7 +408,7 @@ def select_map_with_invalid_number_of_arguments(self):
     """
     node = self.context.node
     exitcode = 42
-    message = "DB::Exception: Function map even number of arguments"
+    message = "DB::Exception: Function map requires even number of arguments"
 
     with When("I create a map using SELECT with invalid number of arguments"):
         node.query("SELECT map(1,2,3)", exitcode=exitcode, message=message)
@@ -616,7 +616,7 @@ def table_map_invalid_key(self, type, data, select, exitcode, message, order_by=
         Name("filter rows by map having different pair order")),
     ("Map(String, String)", "(map('a','b')),(map('c','d','e','f')),(map('e','f'))", "m", "m = map('c','d','e','f')", 0, '{"m":{"c":"d","e":"f"}}', None,
         Name("filter rows by map having the same pair order")),
-    ("Map(String, String)", "(map('a','b')),(map('e','f'))", "m", "m = map()", 43, 'DB::Exception: Illegal types of arguments ', None,
+    ("Map(String, String)", "(map('a','b')),(map('e','f'))", "m", "m = map()", 0, '', None,
         Name("filter rows by empty map")),
     ("Map(String, Int8)", "(map('a',1,'b',2)),(map('a',2)),(map('b',3))", "m", "m['a'] = 1", 0, '{"m":{"a":1,"b":2}}', None,
         Name("filter rows by map key value")),
@@ -720,7 +720,7 @@ def cast_tuple_of_two_arrays_to_map(self, tuple, type, exitcode, message):
     ("(([1, 2, 3], ['Ready', 'Steady', 'Go']))", "Map(String, String)",
         0, '{"m":{"1":"Ready","2":"Steady","3":"Go"}}', False, Name("int -> string")),
     ("((['1', '2', '3'], ['Ready', 'Steady', 'Go']))", "Map(UInt8, String)",
-        176, 'DB::Exception: Unknown codec family code', True, Name("string -> int")),
+        0, '', True, Name("string -> int")),
     ("(([],[]))", "Map(String, String)",
          0, '{"m":{}}', False, Name("empty arrays to map str:str")),
     ("(([],[]))", "Map(UInt8, Array(Int8))",