diff --git a/Makefile.am b/Makefile.am
index 212a293..1dee105 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,9 @@
 test_create_zero_size_window_SOURCES = test/create_zero_size_window.c \
 				       $(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
 
+test_implicit_flush_SOURCES = test/implicit_flush.c \
+			     $(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
+
 check_PROGRAMS = test/sanity \
 		 test/copy_flash \
 		 test/erase_flash \
@@ -77,6 +80,7 @@
 		 test/mark_write_erased_v2 \
 		 test/bmc_event_ack_v2 \
 		 test/create_oversize_window \
-		 test/create_zero_size_window
+		 test/create_zero_size_window \
+		 test/implicit_flush
 
 TESTS = $(check_PROGRAMS)
diff --git a/test/implicit_flush.c b/test/implicit_flush.c
new file mode 100644
index 0000000..57676b8
--- /dev/null
+++ b/test/implicit_flush.c
@@ -0,0 +1,166 @@
+/*
+ * MBox Daemon Test File
+ *
+ * Copyright 2017 IBM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <assert.h>
+#include <sys/mman.h>
+
+#include "mbox.h"
+#include "mboxd_msg.h"
+
+#include "test/mbox.h"
+#include "test/system.h"
+
+static const uint8_t get_info[] = {
+	0x02, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t create_write_window[] = {
+	0x06, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t mark_write_dirty[] = {
+	0x07, 0x02, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t create_read_window[] = {
+	0x04, 0x03, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t create_read_window_response[] = {
+	0x04, 0x03, 0xfd, 0xff, 0x03, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+};
+
+static const uint8_t close_window[] = {
+	0x05, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t close_window_response[] = {
+	0x05, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+};
+
+const uint8_t start_data[] = { 0xaa, 0x55, 0xaa };
+const uint8_t finish_data[] = { 0xaa, 0x00, 0xaa };
+
+#define MEM_SIZE	sizeof(start_data)
+#define ERASE_SIZE	1
+#define N_WINDOWS	1
+#define WINDOW_SIZE	sizeof(start_data)
+
+int setup(struct mbox_context *ctx)
+{
+	int rc;
+
+	rc = mbox_set_mtd_data(ctx, start_data, sizeof(start_data));
+	assert(rc == 0);
+
+	rc = mbox_command_dispatch(ctx, get_info, sizeof(get_info));
+	assert(rc == 1);
+
+	rc = mbox_command_dispatch(ctx, create_write_window,
+			sizeof(create_write_window));
+	assert(rc == 1);
+
+	return rc;
+}
+
+int flush_on_close(struct mbox_context *ctx)
+{
+	uint8_t *map;
+	int rc;
+
+	rc = setup(ctx);
+	assert(rc == 1);
+
+	((uint8_t *)ctx->mem)[1] = 0x00;
+
+	rc = mbox_command_dispatch(ctx, mark_write_dirty,
+			sizeof(mark_write_dirty));
+	assert(rc == 1);
+
+	rc = mbox_command_dispatch(ctx, close_window, sizeof(close_window));
+	assert(rc == 1);
+
+	rc = mbox_cmp(ctx, close_window_response,
+			sizeof(close_window_response));
+	assert(rc == 0);
+
+	map = mmap(NULL, MEM_SIZE, PROT_READ, MAP_PRIVATE,
+			ctx->fds[MTD_FD].fd, 0);
+	assert(map != MAP_FAILED);
+
+	rc = memcmp(finish_data, map, sizeof(finish_data));
+	assert(rc == 0);
+
+	return rc;
+}
+
+int flush_on_create(struct mbox_context *ctx)
+{
+	uint8_t *map;
+	int rc;
+
+	rc = setup(ctx);
+	assert(rc == 1);
+
+	((uint8_t *)ctx->mem)[1] = 0x00;
+
+	rc = mbox_command_dispatch(ctx, mark_write_dirty,
+			sizeof(mark_write_dirty));
+	assert(rc == 1);
+
+	rc = mbox_command_dispatch(ctx, create_read_window,
+			sizeof(create_read_window));
+	assert(rc == 1);
+
+	rc = mbox_cmp(ctx, create_read_window_response,
+			sizeof(create_read_window_response));
+	assert(rc == 0);
+
+	map = mmap(NULL, MEM_SIZE, PROT_READ, MAP_PRIVATE,
+			ctx->fds[MTD_FD].fd, 0);
+	assert(map != MAP_FAILED);
+
+	rc = memcmp(finish_data, map, sizeof(finish_data));
+	assert(rc == 0);
+
+	return rc;
+}
+
+int main(void)
+{
+	struct mbox_context *ctx;
+
+	system_set_reserved_size(MEM_SIZE);
+	system_set_mtd_sizes(MEM_SIZE, ERASE_SIZE);
+
+	ctx = mbox_create_test_context(N_WINDOWS, WINDOW_SIZE);
+
+	flush_on_close(ctx);
+
+	flush_on_create(ctx);
+
+	return 0;
+};