diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index 5bfde0bfd..60a7a21d9 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -1,3 +1,6 @@
+[client]
+quick
+
 [mysqld]
 plugin-load-add=ha_columnstore.so
 
diff --git a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result
new file mode 100644
index 000000000..c384d9650
--- /dev/null
+++ b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result
@@ -0,0 +1 @@
+"Check that quick mode is enabled"
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\$";
diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt
index 0a5dcd7dc..b0189d3dd 100644
--- a/oam/install_scripts/CMakeLists.txt
+++ b/oam/install_scripts/CMakeLists.txt
@@ -127,4 +127,4 @@ install(FILES mariadb-columnstore.service
 install(FILES  module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-engine)
 
 find_package (Python3 COMPONENTS Interpreter REQUIRED)
-add_test(NAME PythonUnitTests COMMAND ${Python3_EXECUTABLE} -m unittest test_mcs-savebrm.py)
\ No newline at end of file
+add_test(NAME PythonUnitTests COMMAND ${Python3_EXECUTABLE} -m unittest test_mcs-savebrm.py)