diff --git a/datafusion/sqllogictest/test_files/map.slt b/datafusion/sqllogictest/test_files/map.slt
index ed4f999aa16c5..10ca3ae881bfd 100644
--- a/datafusion/sqllogictest/test_files/map.slt
+++ b/datafusion/sqllogictest/test_files/map.slt
@@ -433,7 +433,7 @@ SELECT MAP {'a': 1, null: 2}
 query ?
 SELECT MAP {[1,2,3]:1, [2,4]:2};
 ----
- {[1, 2, 3]: 1, [2, 4]: 2}
+{[1, 2, 3]: 1, [2, 4]: 2}
 
 # array with different type as key
 # expect to fail due to type coercion error
@@ -483,7 +483,7 @@ SELECT MAP { MAP {1:'a', 2:'b'}:1, MAP {1:'c', 2:'d'}:2 };
 query ?
 SELECT MAP { MAP {1:'a', 2:'b', 3:'c'}:1, MAP {2:'c', 4:'d'}:2 };
 ----
- {{1: a, 2: b, 3: c}: 1, {2: c, 4: d}: 2}
+{{1: a, 2: b, 3: c}: 1, {2: c, 4: d}: 2}
 
 # map as value
 query ?
diff --git a/datafusion/sqllogictest/test_files/pg_compat/pg_compat_types.slt b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_types.slt
index b7497429fa952..7e315a448b48e 100644
--- a/datafusion/sqllogictest/test_files/pg_compat/pg_compat_types.slt
+++ b/datafusion/sqllogictest/test_files/pg_compat/pg_compat_types.slt
@@ -24,18 +24,18 @@ NULL
 query TT
 select 'a'::VARCHAR, ''::VARCHAR
 ----
-a  (empty)
+a (empty)
 
 skipif postgres
 query TT
 select 'a'::CHAR, ''::CHAR
 ----
-a  (empty)
+a (empty)
 
 query TT
 select 'a'::TEXT, ''::TEXT
 ----
-a  (empty)
+a (empty)
 
 skipif postgres
 query I
diff --git a/datafusion/sqllogictest/test_files/select.slt b/datafusion/sqllogictest/test_files/select.slt
index f2ab4135aaa76..d7ff51011b650 100644
--- a/datafusion/sqllogictest/test_files/select.slt
+++ b/datafusion/sqllogictest/test_files/select.slt
@@ -459,7 +459,7 @@ VALUES (-1)
 query IIB
 VALUES (2+1,2-1,2>1)
 ----
-3    1    true
+3 1 true
 
 # multiple rows values
 query I rowsort
@@ -472,8 +472,8 @@ VALUES (1),(2)
 query IT rowsort
 VALUES (1,'a'),(2,'b')
 ----
-1   a
-2   b
+1 a
+2 b
 
 # table foo for distinct order by
 statement ok
diff --git a/datafusion/sqllogictest/test_files/window.slt b/datafusion/sqllogictest/test_files/window.slt
index 4a2d9e1d68641..29ff62ab34f95 100644
--- a/datafusion/sqllogictest/test_files/window.slt
+++ b/datafusion/sqllogictest/test_files/window.slt
@@ -3679,14 +3679,14 @@ SELECT
 FROM score_board s
 ORDER BY team_name, score;
 ----
-Mongrels	Apu	350	1
-Mongrels	Ned	666	1
-Mongrels	Meg	1030	2
-Mongrels	Burns	1270	2
-Simpsons	Homer	1	1
-Simpsons	Lisa	710	1
-Simpsons	Marge	990	2
-Simpsons	Bart	2010	2
+Mongrels Apu 350 1
+Mongrels Ned 666 1
+Mongrels Meg 1030 2
+Mongrels Burns 1270 2
+Simpsons Homer 1 1
+Simpsons Lisa 710 1
+Simpsons Marge 990 2
+Simpsons Bart 2010 2
 
 query TTII
 SELECT
@@ -3697,14 +3697,14 @@ SELECT
 FROM score_board s
 ORDER BY score;
 ----
-Simpsons	Homer	1	1
-Mongrels	Apu	350	1
-Mongrels	Ned	666	1
-Simpsons	Lisa	710	1
-Simpsons	Marge	990	2
-Mongrels	Meg	1030	2
-Mongrels	Burns	1270	2
-Simpsons	Bart	2010	2
+Simpsons Homer 1 1
+Mongrels Apu 350 1
+Mongrels Ned 666 1
+Simpsons Lisa 710 1
+Simpsons Marge 990 2
+Mongrels Meg 1030 2
+Mongrels Burns 1270 2
+Simpsons Bart 2010 2
 
 query TTII
 SELECT
@@ -3715,14 +3715,14 @@ SELECT
 FROM score_board s
 ORDER BY team_name, score;
 ----
-Mongrels	Apu	350	1
-Mongrels	Ned	666	2
-Mongrels	Meg	1030	3
-Mongrels	Burns	1270	4
-Simpsons	Homer	1	1
-Simpsons	Lisa	710	2
-Simpsons	Marge	990	3
-Simpsons	Bart	2010	4
+Mongrels Apu 350 1
+Mongrels Ned 666 2
+Mongrels Meg 1030 3
+Mongrels Burns 1270 4
+Simpsons Homer 1 1
+Simpsons Lisa 710 2
+Simpsons Marge 990 3
+Simpsons Bart 2010 4
 
 query TTII
 SELECT
@@ -3733,14 +3733,14 @@ SELECT
 FROM score_board s
 ORDER BY team_name, score;
 ----
-Mongrels	Apu	350	1
-Mongrels	Ned	666	1
-Mongrels	Meg	1030	1
-Mongrels	Burns	1270	1
-Simpsons	Homer	1	1
-Simpsons	Lisa	710	1
-Simpsons	Marge	990	1
-Simpsons	Bart	2010	1
+Mongrels Apu 350 1
+Mongrels Ned 666 1
+Mongrels Meg 1030 1
+Mongrels Burns 1270 1
+Simpsons Homer 1 1
+Simpsons Lisa 710 1
+Simpsons Marge 990 1
+Simpsons Bart 2010 1
 
 # incorrect number of parameters for ntile
 query error DataFusion error: Execution error: NTILE requires a positive integer, but finds NULL
@@ -4849,10 +4849,10 @@ SELECT
   nth_value(column2, arrow_cast(2, 'Int32')) OVER (order by column1)
 FROM t;
 ----
-3 1 1 4    4    NULL NULL NULL NULL
-4 1 1 5    5    3    3    4    4
-5 2 2 6    6    4    4    4    4
-6 2 2 NULL NULL 5    5    4    4
+3 1 1 4 4 NULL NULL NULL NULL
+4 1 1 5 5 3 3 4 4
+5 2 2 6 6 4 4 4 4
+6 2 2 NULL NULL 5 5 4 4
 
 # NTILE specifies the argument types so the error is different
 query error