diff --git a/Makefile.am b/Makefile.am
index e91faff..ea50763 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,9 @@
 test_create_write_window_v2_SOURCES = test/create_write_window_v2.c \
 				      $(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
 
+test_close_window_v2_SOURCES = test/close_window_v2.c \
+			       $(TEST_MBOX_SRCS) $(TEST_MOCK_SRCS)
+
 check_PROGRAMS = test/sanity \
 		 test/copy_flash \
 		 test/erase_flash \
@@ -49,6 +52,7 @@
 		 test/reset_state \
 		 test/get_flash_info_v2 \
 		 test/create_read_window_v2 \
-		 test/create_write_window_v2
+		 test/create_write_window_v2 \
+		 test/close_window_v2
 
 TESTS = $(check_PROGRAMS)
diff --git a/test/close_window_v2.c b/test/close_window_v2.c
new file mode 100644
index 0000000..40d71ac
--- /dev/null
+++ b/test/close_window_v2.c
@@ -0,0 +1,124 @@
+/*
+ * 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 "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_read_window[] = {
+	0x04, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t close_window_no_flag[] = {
+	0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t response_no_flag[] = {
+	0x05, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+};
+
+static const uint8_t close_window_short_lifetime[] = {
+	0x05, 0x03, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+static const uint8_t response_short_lifetime[] = {
+	0x05, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01
+};
+
+#define MEM_SIZE	3
+#define ERASE_SIZE	1
+#define N_WINDOWS	1
+#define WINDOW_SIZE	3
+
+int setup(struct mbox_context *ctx)
+{
+	int rc;
+
+	rc = mbox_command_dispatch(ctx, get_info, sizeof(get_info));
+	assert(rc == 1);
+
+	rc = mbox_command_dispatch(ctx, create_read_window,
+			sizeof(create_read_window));
+	assert(rc == 1);
+
+	return rc;
+}
+
+int no_flag(struct mbox_context *ctx)
+{
+	int rc;
+
+	setup(ctx);
+
+	rc = mbox_command_dispatch(ctx, close_window_no_flag,
+			sizeof(close_window_no_flag));
+	assert(rc == 1);
+
+	rc = mbox_cmp(ctx, response_no_flag, sizeof(response_no_flag));
+	assert(rc == 0);
+
+	return rc;
+}
+
+int short_lifetime(struct mbox_context *ctx)
+{
+	int rc;
+
+	setup(ctx);
+
+	rc = mbox_command_dispatch(ctx, close_window_short_lifetime,
+			sizeof(close_window_short_lifetime));
+	assert(rc == 1);
+
+	rc = mbox_cmp(ctx, response_short_lifetime,
+			sizeof(response_short_lifetime));
+	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);
+
+	no_flag(ctx);
+
+	short_lifetime(ctx);
+
+	return 0;
+};