Improve coverage of vbnvstorage test

BUG=chromium-os:38139
BRANCH=none
TEST=make runtests

Change-Id: I93aabedb99fdeba01954a4b59e3e089b4087380c
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/41850
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
diff --git a/Makefile b/Makefile
index 7c09401..62af1ed 100644
--- a/Makefile
+++ b/Makefile
@@ -414,7 +414,6 @@
 	tpm_bootmode_tests \
 	utility_string_tests \
 	utility_tests \
-	vboot_nvstorage_test \
 	vboot_api_init_tests \
 	vboot_api_devmode_tests \
 	vboot_api_firmware_tests \
@@ -424,7 +423,8 @@
 	vboot_common2_tests \
 	vboot_common3_tests \
 	vboot_ec_tests \
-	vboot_firmware_tests
+	vboot_firmware_tests \
+	vboot_nvstorage_test
 
 # Grrr
 ifneq (${IN_CHROOT},)
@@ -946,6 +946,7 @@
 	${RUNTEST} ${BUILD_RUN}/tests/vboot_common2_tests ${TEST_KEYS}
 	${RUNTEST} ${BUILD_RUN}/tests/vboot_common3_tests ${TEST_KEYS}
 	${RUNTEST} ${BUILD_RUN}/tests/vboot_firmware_tests
+	${RUNTEST} ${BUILD_RUN}/tests/vboot_nvstorage_test
 
 .PHONY: runfutiltests
 runfutiltests: DESTDIR := ${TEST_INSTALL_DIR}