diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc
index 67c96b4b648..1565e20d732 100644
--- a/extra/mariabackup/backup_copy.cc
+++ b/extra/mariabackup/backup_copy.cc
@@ -977,7 +977,7 @@ copy_file(ds_ctxt_t *datasink,
 	const char		*action;
 
 	if (!datafile_open(src_file_path, &cursor, thread_n)) {
-		goto error;
+		goto error_close;
 	}
 
 	strncpy(dst_name, cursor.rel_path, sizeof(dst_name));
diff --git a/mysql-test/suite/mariabackup/include/restart_and_restore.inc b/mysql-test/suite/mariabackup/include/restart_and_restore.inc
index 46eb5eee4a8..39616cc6f15 100644
--- a/mysql-test/suite/mariabackup/include/restart_and_restore.inc
+++ b/mysql-test/suite/mariabackup/include/restart_and_restore.inc
@@ -7,7 +7,7 @@ shutdown_server;
 echo # remove datadir;
 rmdir $_datadir;
 echo # xtrabackup move back;
-exec $XTRABACKUP --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2;
+exec $XTRABACKUP --defaults-file=$MYSQLTEST_VARDIR/my.cnf --copy-back --datadir=$_datadir --target-dir=$targetdir --parallel=2;
 echo # restart server;
 exec echo "restart" > $_expect_file_name;
 enable_reconnect;