diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index a59e8f0858f..9b6a8b4c316 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -5508,9 +5508,22 @@ xtrabackup_apply_delta(
 					buf + FSP_HEADER_OFFSET + FSP_SIZE);
 				if (mach_read_from_4(buf
 						     + FIL_PAGE_SPACE_ID)) {
+#ifdef _WIN32
+					os_offset_t last_page =
+					  os_file_get_size(dst_file) /
+					  page_size;
+
+					/* os_file_set_size() would
+					shrink the size of the file */
+					if (last_page < n_pages &&
+					    !os_file_set_size(
+					       dst_path, dst_file,
+					       n_pages * page_size))
+#else
 					if (!os_file_set_size(
 						    dst_path, dst_file,
 						    n_pages * page_size))
+#endif /* _WIN32 */
 						goto error;
 				} else if (fil_space_t* space
 					   = fil_system.sys_space) {
diff --git a/mysql-test/suite/mariabackup/incremental_compressed.result b/mysql-test/suite/mariabackup/incremental_compressed.result
index f8b01808642..aeb52019aa0 100644
--- a/mysql-test/suite/mariabackup/incremental_compressed.result
+++ b/mysql-test/suite/mariabackup/incremental_compressed.result
@@ -4,6 +4,9 @@
 #
 CREATE TABLE t (pk INT PRIMARY KEY) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
 ALTER TABLE t PARTITION BY KEY(pk);
+# Incremental backup
+# Prepare fullbackup
+# Prepare incremental backup
 # shutdown server
 # remove datadir
 # xtrabackup move back
diff --git a/mysql-test/suite/mariabackup/incremental_compressed.test b/mysql-test/suite/mariabackup/incremental_compressed.test
index 15aff909a43..de7f588290f 100644
--- a/mysql-test/suite/mariabackup/incremental_compressed.test
+++ b/mysql-test/suite/mariabackup/incremental_compressed.test
@@ -16,12 +16,18 @@ CREATE TABLE t (pk INT PRIMARY KEY) ENGINE=InnoDB ROW_FORMAT=COMPRESSED;
 
 ALTER TABLE t PARTITION BY KEY(pk);
 
+--echo # Incremental backup
 --exec $XTRABACKUP --backup --target-dir=$incremental_dir --incremental-basedir=$basedir --protocol=tcp --port=$MASTER_MYPORT --user=root > $incremental_dir.log 2>&1
+--echo # Prepare fullbackup
 --exec $XTRABACKUP --prepare --target-dir=$basedir --user=root > $MYSQL_TMP_DIR/backup_prepare_0.log 2>&1
---exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir --user=root >  $MYSQL_TMP_DIR/backup_prepare_1.log
---cat_file $MYSQL_TMP_DIR/backup_prepare_1.log
+--echo # Prepare incremental backup
+--exec $XTRABACKUP --prepare --target-dir=$basedir --incremental-dir=$incremental_dir --user=root >  $MYSQL_TMP_DIR/backup_prepare_1.log 2>&1
 let $targetdir=$basedir;
 -- source include/restart_and_restore.inc
-
 SHOW CREATE TABLE t;
 DROP TABLE t;
+remove_file $incremental_dir.log;
+remove_file $MYSQL_TMP_DIR/backup_prepare_0.log;
+remove_file $MYSQL_TMP_DIR/backup_prepare_1.log;
+rmdir $basedir;
+rmdir $incremental_dir;