diff --git a/maxscale-system-test/mdbci/run_test.sh b/maxscale-system-test/mdbci/run_test.sh
index b34962aad..c74ab8dc9 100755
--- a/maxscale-system-test/mdbci/run_test.sh
+++ b/maxscale-system-test/mdbci/run_test.sh
@@ -6,34 +6,34 @@
 # see lists of supported boxes
 # https://github.com/mariadb-corporation/mdbci/tree/integration/BOXES
 
-# $template - name of MDBCI json template file 
+# $template - name of MDBCI json template file
 # Template file have to be in ./templates/, file name
 # have to be '$template.json.template
 # Template file can contain references to any variables -
 # all ${variable_name} will be replaced with values
 
 # $name - name of test run. It can be any string of leytters or digits
-# If it is not defined, name will be automatically genereted 
+# If it is not defined, name will be automatically genereted
 # using $box and current date and time
 
-# $ci_url - URL to Maxscale CI repository 
+# $ci_url - URL to Maxscale CI repository
 # (default "http://max-tst-01.mariadb.com/ci-repository/")
 # if build is done also locally and binaries are not uploaded to
 # max-tst-01.mariadb.com $ci_url should toint to local web server
-# e.g. http://192.168.122.1/repository (IP should be a host IP in the 
+# e.g. http://192.168.122.1/repository (IP should be a host IP in the
 # virtual network (not 127.0.0.1))
 
 # $product - 'mariadb' or 'mysql'
 
 # $version - version of backend DB (e.g. '10.1', '10.2')
 
-# $galera_version - version of Galera backend DB 
-# same as $version by default 
+# $galera_version - version of Galera backend DB
+# same as $version by default
 
-# $target - name of binary repository 
+# $target - name of binary repository
 # (name of subdirectroy http://max-tst-01.mariadb.com/ci-repository/)
 
-# $team_keys - path to the file with open ssh keys to be 
+# $team_keys - path to the file with open ssh keys to be
 # installed on all VMs (default ${HOME}/team_keys)
 
 # $don_not_destroy_vm - if 'yes' VM won't be destored afther the test
@@ -61,6 +61,7 @@ export name=`echo $name | sed "s/?//g"`
 ${script_dir}/create_config.sh
 res=$?
 
+ulimit -c unlimited
 if [ $res == 0 ] ; then
 #    . ${script_dir}/configure_backend.sh
     . ${script_dir}/set_env.sh $name
@@ -75,7 +76,7 @@ if [ $res == 0 ] ; then
         if [ $? != 0 ]; then
             echo "Backend broken!"
             if [ "${do_not_destroy_vm}" != "yes" ] ; then
-                ${script_dir}/destroy.sh       
+                ${script_dir}/destroy.sh
             fi
             rm ~/vagrant_lock
             exit 1
@@ -83,9 +84,9 @@ if [ $res == 0 ] ; then
         ${mdbci_dir}/mdbci snapshot take --path-to-nodes $name --snapshot-name clean
         ctest -VV -D Nightly ${test_set}
     fi
-
-    cd $dir
+    cp core.* ${logs_publish_dir}
     ${script_dir}/copy_logs.sh
+    cd $dir
 else
   echo "Failed to create VMs, exiting"
   if [ "${do_not_destroy_vm}" != "yes" ] ; then
@@ -99,4 +100,3 @@ if [ "${do_not_destroy_vm}" != "yes" ] ; then
 	${script_dir}/destroy.sh
 	echo "clean up done!"
 fi
-