diff --git a/mboxd_windows.c b/mboxd_windows.c
index 9742180..275f38a 100644
--- a/mboxd_windows.c
+++ b/mboxd_windows.c
@@ -568,6 +568,7 @@
 	if (!cur) {
 		MSG_DBG("No uninitialised window, evicting one\n");
 		cur = find_oldest_window(context);
+		reset_window(context, cur);
 	}
 
 /*
diff --git a/test/vpnor/Makefile.am.include b/test/vpnor/Makefile.am.include
index dac43c8..5f71697 100644
--- a/test/vpnor/Makefile.am.include
+++ b/test/vpnor/Makefile.am.include
@@ -318,5 +318,4 @@
 	%reldir%/create_read_window_remap
 
 XFAIL_TESTS += %reldir%/dump_flash
-XFAIL_TESTS += %reldir%/create_read_window_size
 endif