diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index 5bfde0bfd..e0b77f0b2 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -1,3 +1,7 @@
+[mariadb-client]
+quick
+quick-max-column-width=0
+
 [mysqld]
 plugin-load-add=ha_columnstore.so
 
diff --git a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test
new file mode 100644
index 000000000..1d4ba8ca5
--- /dev/null
+++ b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test
@@ -0,0 +1,4 @@
+--echo "Check that quick mode is enabled"
+# the following line will fail the test if quick mode
+# is not enabled in (some) configuration file as default.
+system mariadb --help | grep -q -E "^quick +TRUE\$";