diff --git a/host/lib/crossystem.c b/host/lib/crossystem.c
index 63f20c4..59acc0d 100644
--- a/host/lib/crossystem.c
+++ b/host/lib/crossystem.c
@@ -685,8 +685,8 @@
 			break;
 	}
 
-	if (!index || index == buf_sz / vbnv_size) {
-		fprintf(stderr, "VBNV is either uninitialized or corrupted.\n");
+	if (!index) {
+		fprintf(stderr, "VBNV is uninitialized.\n");
 		return -1;
 	}
 
@@ -737,7 +737,7 @@
 	}
 
 	next_index = current_index + 1;
-	if ((next_index + 1) * vbnv_size == flash_size) {
+	if (next_index * vbnv_size == flash_size) {
 		/* VBNV is full.  Erase and write at beginning. */
 		memset(flash_buf, 0xff, flash_size);
 		next_index = 0;
diff --git a/tests/vb2_host_nvdata_flashrom_tests.c b/tests/vb2_host_nvdata_flashrom_tests.c
index 7a14785..33b435d 100644
--- a/tests/vb2_host_nvdata_flashrom_tests.c
+++ b/tests/vb2_host_nvdata_flashrom_tests.c
@@ -147,12 +147,12 @@
 
 	reset_test_data(&ctx, sizeof(test_nvdata_16b));
 
-	for (int entry = 0; entry < fake_flash_entry_count - 2; entry++)
+	for (int entry = 0; entry < fake_flash_entry_count - 1; entry++)
 		memcpy(fake_flash_region + (entry * VB2_NVDATA_SIZE),
 		       test_nvdata_16b, sizeof(test_nvdata_16b));
 
 	memcpy(fake_flash_region +
-	       ((fake_flash_entry_count - 2) * VB2_NVDATA_SIZE),
+	       ((fake_flash_entry_count - 1) * VB2_NVDATA_SIZE),
 	       test_nvdata2_16b, sizeof(test_nvdata2_16b));
 
 	TEST_EQ(vb2_read_nv_storage_flashrom(&ctx), 0,
@@ -222,7 +222,7 @@
 
 	reset_test_data(&ctx, sizeof(test_nvdata_16b));
 
-	for (int entry = 0; entry < fake_flash_entry_count - 1; entry++)
+	for (int entry = 0; entry < fake_flash_entry_count; entry++)
 		memcpy(fake_flash_region + (entry * VB2_NVDATA_SIZE),
 		       test_nvdata_16b, sizeof(test_nvdata_16b));