diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index 87db319d90dc..7d03ae2c5709 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -3,6 +3,7 @@
 #include <string_view>
 #include <boost/program_options.hpp>
 
+#include <IO/copyData.h>
 #include <IO/ReadBufferFromFileDescriptor.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
@@ -13,6 +14,7 @@
 #include <Parsers/obfuscateQueries.h>
 #include <Parsers/parseQuery.h>
 #include <Common/ErrorCodes.h>
+#include <Common/StringUtils/StringUtils.h>
 #include <Common/TerminalSize.h>
 
 #include <Interpreters/Context.h>
@@ -28,9 +30,8 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <Formats/FormatFactory.h>
 #include <Formats/registerFormats.h>
-
 #include <Processors/Transforms/getSourceFromASTInsertQuery.h>
-#include <IO/copyData.h>
+
 
 namespace DB::ErrorCodes
 {
@@ -236,8 +237,10 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                 if (auto * insert_query = res->as<ASTInsertQuery>(); insert_query && insert_query->data)
                 {
                     if ("Values" != insert_query->format)
-                        throw Exception(DB::ErrorCodes::NOT_IMPLEMENTED,
-                            "Can't format INSERT query with data format '{}'", insert_query->format);
+                        throw Exception(DB::ErrorCodes::NOT_IMPLEMENTED, "Can't format INSERT query with data format '{}'", insert_query->format);
+
+                    /// Reset format to default to have `INSERT INTO table VALUES` instead of `INSERT INTO table VALUES FORMAT Values`
+                    insert_query->format = {};
 
                     /// We assume that data ends with a newline character (same as client does)
                     const char * this_query_end = find_first_symbols<'\n'>(insert_query->data, end);
@@ -264,6 +267,9 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                         String res_string = str_buf.str();
                         const char * s_pos = res_string.data();
                         const char * s_end = s_pos + res_string.size();
+                        /// remove trailing spaces
+                        while (s_end > s_pos && isWhitespaceASCIIOneLine(*(s_end - 1)))
+                            --s_end;
                         WriteBufferFromOStream res_cout(std::cout, 4096);
                         /// For multiline queries we print ';' at new line,
                         /// but for single line queries we print ';' at the same line
diff --git a/tests/queries/0_stateless/01753_fix_clickhouse_format.reference b/tests/queries/0_stateless/01753_fix_clickhouse_format.reference
index 0aad4d64c555..735d40995340 100644
--- a/tests/queries/0_stateless/01753_fix_clickhouse_format.reference
+++ b/tests/queries/0_stateless/01753_fix_clickhouse_format.reference
@@ -1,5 +1,4 @@
-SELECT 1
-;
+SELECT 1;
 
 SELECT 1
 UNION ALL
@@ -10,8 +9,7 @@ UNION ALL
 )
 ;
 
-SELECT 1
-;
+SELECT 1;
 
 SELECT 1
 UNION ALL
@@ -22,4 +20,6 @@ UNION ALL
 )
 ;
 
+INSERT INTO t VALUES (1);
+
 OK
diff --git a/tests/queries/0_stateless/01753_fix_clickhouse_format.sh b/tests/queries/0_stateless/01753_fix_clickhouse_format.sh
index 5cdd53b2166c..ba7fe949833f 100755
--- a/tests/queries/0_stateless/01753_fix_clickhouse_format.sh
+++ b/tests/queries/0_stateless/01753_fix_clickhouse_format.sh
@@ -8,4 +8,6 @@ echo "select 1; select 1 union all (select 1 union distinct select 1);   " | $CL
 
 echo "select 1; select 1 union all (select 1 union distinct select 1); -- comment  " | $CLICKHOUSE_FORMAT -n;
 
-echo "insert into t values (1); " | $CLICKHOUSE_FORMAT -n  2>&1 \ | grep -F -q "Code: 578" && echo 'OK' || echo 'FAIL'
+echo "insert into t values (1); " | $CLICKHOUSE_FORMAT -n
+
+echo 'insert into t format JSONEachRow {"a":1};' | $CLICKHOUSE_FORMAT -n  2>&1 \ | grep -F -q "NOT_IMPLEMENTED" && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/02263_format_insert_settings.reference b/tests/queries/0_stateless/02263_format_insert_settings.reference
index e2d1ec3980ec..2bba75f6788b 100644
--- a/tests/queries/0_stateless/02263_format_insert_settings.reference
+++ b/tests/queries/0_stateless/02263_format_insert_settings.reference
@@ -1,7 +1,7 @@
 [multi] insert into foo settings max_threads=1
 Syntax error (query): failed at position 40 (end of query):
 [multi] insert into foo format tsv settings max_threads=1
-Can't format ASTInsertQuery with data, since data will be lost.
+NOT_IMPLEMENTED
 [multi] insert into foo format tsv settings max_threads=1
 INSERT INTO foo
 SETTINGS max_threads = 1
diff --git a/tests/queries/0_stateless/02263_format_insert_settings.sh b/tests/queries/0_stateless/02263_format_insert_settings.sh
index 8b156ffec837..49aa56d6c0a2 100755
--- a/tests/queries/0_stateless/02263_format_insert_settings.sh
+++ b/tests/queries/0_stateless/02263_format_insert_settings.sh
@@ -25,7 +25,7 @@ function run_format_both()
 run_format 'insert into foo settings max_threads=1' |& grep --max-count 2 --only-matching -e "Syntax error (query): failed at position .* (end of query):" -e '^\[.*$'
 
 # compatibility
-run_format 'insert into foo format tsv settings max_threads=1' |& grep --max-count 2 --only-matching -e "Can't format ASTInsertQuery with data, since data will be lost." -e '^\[.*$'
+run_format 'insert into foo format tsv settings max_threads=1' |& grep --max-count 2 --only-matching -e "NOT_IMPLEMENTED" -e '^\[.*$'
 run_format_both 'insert into foo format tsv settings max_threads=1' --allow_settings_after_format_in_insert
 run_format 'insert into foo settings max_threads=1 format tsv settings max_threads=1' --allow_settings_after_format_in_insert |& grep --max-count 2 --only-matching -e "You have SETTINGS before and after FORMAT" -e '^\[.*$'
 
diff --git a/tests/queries/0_stateless/02946_format_values.reference b/tests/queries/0_stateless/02946_format_values.reference
index 8f896fd3ba05..90b2a3cb8ef2 100644
--- a/tests/queries/0_stateless/02946_format_values.reference
+++ b/tests/queries/0_stateless/02946_format_values.reference
@@ -1,10 +1,10 @@
-INSERT INTO table1 FORMAT Values (1, [1,3], 'fd'), (2, [2,4], 'sd'), (3, [3,5], 'td')
+INSERT INTO table1 VALUES (1, [1,3], 'fd'), (2, [2,4], 'sd'), (3, [3,5], 'td')
 ======================================
 SELECT a
 FROM table1
 ;
 
-INSERT INTO table1 FORMAT Values (1, [1,3], 'fd'), (2, [2,4], 'sd'), (3, [3,5], 'td');
+INSERT INTO table1 VALUES (1, [1,3], 'fd'), (2, [2,4], 'sd'), (3, [3,5], 'td');
 
 SELECT b
 FROM table1
@@ -17,7 +17,7 @@ FROM table1
 ;
 
 -- some insert query
-INSERT INTO table1 FORMAT Values (1, [1,3], 'fd'), (2, [2,4], 'sd'), (3, [3,5], 'td');
+INSERT INTO table1 VALUES (1, [1,3], 'fd'), (2, [2,4], 'sd'), (3, [3,5], 'td');
 
 -- more comments
 -- in a row
@@ -135,5 +135,7 @@ FROM
 )
 SELECT b, c, d, e, f FROM (SELECT b, c, d, e, f FROM table1)
 ======================================
-BAD_ARGUMENTS
-BAD_ARGUMENTS
+Option 'max_line_length' must be less than 256.
+2
+Options 'oneline' and 'max_line_length' are mutually exclusive.
+2
diff --git a/tests/queries/0_stateless/02946_format_values.sh b/tests/queries/0_stateless/02946_format_values.sh
index cd44d31d1a11..36e32de42fa5 100755
--- a/tests/queries/0_stateless/02946_format_values.sh
+++ b/tests/queries/0_stateless/02946_format_values.sh
@@ -69,5 +69,5 @@ echo "select b, c, d, e, f from ( select b, c, d, e, f from table1 )" | ${CLICKH
 
 echo "======================================"
 
-echo "select 1" | ${CLICKHOUSE_FORMAT} --comments --max_line_length=260 2>&1 | grep -o 'BAD_ARGUMENTS' ||:
-echo "select 1" | ${CLICKHOUSE_FORMAT} --comments --max_line_length=120 --oneline 2>&1 | grep -o 'BAD_ARGUMENTS' ||:
+{ echo "select 1" | ${CLICKHOUSE_FORMAT} --comments --max_line_length=260 2>&1; echo $?; }
+{ echo "select 1" | ${CLICKHOUSE_FORMAT} --comments --max_line_length=120 --oneline 2>&1; echo $?; }