diff --git a/tools/analysis/data-aggregator/resulttype-occurrences.sh b/tools/analysis/data-aggregator/resulttype-occurrences.sh
index 2d451ff7..1c93900c 100755
--- a/tools/analysis/data-aggregator/resulttype-occurrences.sh
+++ b/tools/analysis/data-aggregator/resulttype-occurrences.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 set -e
 
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
 if [ $# -ne 3 -a $# -ne 1 ]; then
-	echo "usage: $0 DATABASE [ VARIANT BENCHMARK ]" >&2
+	echo "usage: $0 [ -t ] DATABASE [ VARIANT BENCHMARK ]" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
 	exit 1
 fi
 
 DATABASE=$1
 VARIANT=$2
 BENCHMARK=$3
-# add "-t" for more readable output
-MYSQL="mysql -B --quick $DATABASE"
+MYSQL="mysql $FORMAT $DATABASE"
 
 if [ -z "$VARIANT" ]; then
 $MYSQL << EOT
diff --git a/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh b/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh
index 66ca2253..5fa7c2c3 100755
--- a/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh
+++ b/tools/analysis/data-aggregator/resulttype-occurrences_coverage.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 set -e
 
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
 if [ $# -ne 3 -a $# -ne 1 ]; then
-	echo "usage: $0 DATABASE [ VARIANT BENCHMARK ]" >&2
+	echo "usage: $0 [ -t ] DATABASE [ VARIANT BENCHMARK ]" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
 	exit 1
 fi
 
 DATABASE=$1
 VARIANT=$2
 BENCHMARK=$3
-# add "-t" for more readable output
-MYSQL="mysql -B --quick $DATABASE"
+MYSQL="mysql $FORMAT $DATABASE"
 
 if [ -z "$VARIANT" ]; then
 $MYSQL << EOT
diff --git a/tools/analysis/data-aggregator/symbol-occurrences.sh b/tools/analysis/data-aggregator/symbol-occurrences.sh
index c6e9a277..f430fd0d 100755
--- a/tools/analysis/data-aggregator/symbol-occurrences.sh
+++ b/tools/analysis/data-aggregator/symbol-occurrences.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 set -e
 
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
 if [ ! $# -eq 3 ]; then
-	echo "usage: $0 DATABASE VARIANT BENCHMARK" >&2
+	echo "usage: $0 [ -t ] DATABASE VARIANT BENCHMARK" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
 	exit 1
 fi
 
 DATABASE=$1
 VARIANT=$2
 BENCHMARK=$3
-# add "-t" for more readable output
-MYSQL="mysql -B --quick $DATABASE"
+MYSQL="mysql $FORMAT $DATABASE"
 
 $MYSQL << EOT
 	SELECT v.benchmark, v.variant, s.name, s.size, r.resulttype, SUM(t.time2-t.time1+1) AS occurrences
diff --git a/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh b/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh
index 45a70de9..8335482c 100755
--- a/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh
+++ b/tools/analysis/data-aggregator/symbol-occurrences_coverage.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 set -e
 
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
 if [ ! $# -eq 3 ]; then
-	echo "usage: $0 DATABASE VARIANT BENCHMARK" >&2
+	echo "usage: $0 [ -t ] DATABASE VARIANT BENCHMARK" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
 	exit 1
 fi
 
 DATABASE=$1
 VARIANT=$2
 BENCHMARK=$3
-# add "-t" for more readable output
-MYSQL="mysql -B --quick $DATABASE"
+MYSQL="mysql $FORMAT $DATABASE"
 
 $MYSQL << EOT
 	SELECT v.benchmark, v.variant, s.name, s.size, r.resulttype,
diff --git a/tools/analysis/data-aggregator/translation-unit-occurrences.sh b/tools/analysis/data-aggregator/translation-unit-occurrences.sh
index c4727bf3..2427706b 100755
--- a/tools/analysis/data-aggregator/translation-unit-occurrences.sh
+++ b/tools/analysis/data-aggregator/translation-unit-occurrences.sh
@@ -1,16 +1,23 @@
 #!/bin/bash
 set -e
 
+if [ "$1" = -t ]; then
+	FORMAT=-t
+	shift
+else
+	FORMAT=-B
+fi
+
 if [ ! $# -eq 3 ]; then
-	echo "usage: $0 DATABASE VARIANT BENCHMARK" >&2
+	echo "usage: $0 [ -t ] DATABASE VARIANT BENCHMARK" >&2
+	echo "  -t      Display output in table format (tab-separated CSV otherwise)" >&2
 	exit 1
 fi
 
 DATABASE=$1
 VARIANT=$2
 BENCHMARK=$3
-# add "-t" for more readable output
-MYSQL="mysql -B --quick $DATABASE"
+MYSQL="mysql $FORMAT $DATABASE"
 
 $MYSQL << EOT
 SELECT v.benchmark, v.variant, f.path, r.resulttype, SUM(t.time2-t.time1+1) AS occurrences