tests/common/tests.h: rename test_common.h to common/tests.h

Create tests/common/ to put some common files.

BUG=none
BRANCH=none
TEST=make runtests

Signed-off-by: Hsin-Te Yuan <yuanhsinte@google.com>
Change-Id: I8918b7a1e62d47fca6074ef123e2de6f46f1aa00
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3754814
Reviewed-by: Hsuan Ting Chen <roccochen@chromium.org>
Reviewed-by: Yu-Ping Wu <yupingso@chromium.org>

56 files changed, 62 insertions, 62 deletions

diff --git a/Makefile b/Makefile
index a3566d46..e1569516 100644
--- a/Makefile
+++ b/Makefile
@@ -698,10 +698,10 @@ ALL_OBJS += ${FUTIL_OBJS}
 # Library of handy test functions.
 TESTLIB = ${BUILD}/tests/test.a
 
-TESTLIB_SRCS += \
-	tests/test_common.c \
-	tests/timer_utils.c \
-	tests/crc32_test.c
+TEST_COMMON_DIR = tests/common
+
+TESTLIB_SRCS += $(wildcard $(TEST_COMMON_DIR)/*.c)
+TESTLIB_SRCS += tests/crc32_test.c
 
 TESTLIB_OBJS = ${TESTLIB_SRCS:%.c=${BUILD}/%.o}
 TEST_OBJS += ${TESTLIB_OBJS}
diff --git a/tests/cgptlib_test.c b/tests/cgptlib_test.c
index 6fd7c322..f614977b 100644
--- a/tests/cgptlib_test.c
+++ b/tests/cgptlib_test.c
@@ -9,10 +9,10 @@
 #include "../cgpt/cgpt.h"
 #include "cgptlib_internal.h"
 #include "cgptlib_test.h"
+#include "common/tests.h"
 #include "crc32.h"
 #include "crc32_test.h"
 #include "gpt.h"
-#include "test_common.h"
 
 /*
  * Testing partition layout (sector_bytes=512)
diff --git a/tests/chromeos_config_tests.c b/tests/chromeos_config_tests.c
index 2408d8ce..6b24a331 100644
--- a/tests/chromeos_config_tests.c
+++ b/tests/chromeos_config_tests.c
@@ -11,8 +11,8 @@
 #include "2common.h"
 #include "2return_codes.h"
 #include "chromeos_config.h"
+#include "common/tests.h"
 #include "host_misc.h"
-#include "test_common.h"
 
 static struct {
 	const char *path;
diff --git a/tests/test_common.c b/tests/common/tests.c
index 2ce3a5da..7df16134 100644
--- a/tests/test_common.c
+++ b/tests/common/tests.c
@@ -10,7 +10,7 @@
 #include <string.h>
 
 #include "2common.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Global test success flag. */
 int gTestSuccess = 1;
diff --git a/tests/test_common.h b/tests/common/tests.h
index c3da8805..656e2d91 100644
--- a/tests/test_common.h
+++ b/tests/common/tests.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef VBOOT_REFERENCE_TEST_COMMON_H_
-#define VBOOT_REFERENCE_TEST_COMMON_H_
+#ifndef VBOOT_REFERENCE_COMMON_TESTS_H_
+#define VBOOT_REFERENCE_COMMON_TESTS_H_
 
 #include <setjmp.h>
 #include <stdio.h>
@@ -164,4 +164,4 @@ int test_abort(int aborted,
 			abort(); \
 	} while (0)
 
-#endif  /* VBOOT_REFERENCE_TEST_COMMON_H_ */
+#endif  /* VBOOT_REFERENCE_COMMON_TESTS_H_ */
diff --git a/tests/timer_utils.c b/tests/common/timer_utils.c
index 25e7503c..25e7503c 100644
--- a/tests/timer_utils.c
+++ b/tests/common/timer_utils.c
diff --git a/tests/timer_utils.h b/tests/common/timer_utils.h
index 8cafdf91..b2a424a5 100644
--- a/tests/timer_utils.h
+++ b/tests/common/timer_utils.h
@@ -3,8 +3,8 @@
  * found in the LICENSE file.
  */
 
-#ifndef VBOOT_REFERENCE_TIMER_UTILS_H_
-#define VBOOT_REFERENCE_TIMER_UTILS_H_
+#ifndef VBOOT_REFERENCE_COMMON_TIMER_UTILS_H_
+#define VBOOT_REFERENCE_COMMON_TIMER_UTILS_H_
 
 #include <inttypes.h>
 #include <time.h>
@@ -23,4 +23,4 @@ void StopTimer(ClockTimerState* ct);
 /* Get duration in milliseconds. */
 uint32_t GetDurationMsecs(ClockTimerState* ct);
 
-#endif  /* VBOOT_REFERENCE_TIMER_UTILS_H_ */
+#endif  /* VBOOT_REFERENCE_COMMON_TIMER_UTILS_H_ */
diff --git a/tests/crc32_test.c b/tests/crc32_test.c
index 1d1d8cd3..ee60cc0a 100644
--- a/tests/crc32_test.c
+++ b/tests/crc32_test.c
@@ -4,9 +4,9 @@
  */
 
 #include "cgptlib_test.h"
+#include "common/tests.h"
 #include "crc32.h"
 #include "crc32_test.h"
-#include "test_common.h"
 
 #define MAX_VECTOR_LEN 256
 
diff --git a/tests/futility/test_file_types.c b/tests/futility/test_file_types.c
index 17388cfd..ee433bab 100644
--- a/tests/futility/test_file_types.c
+++ b/tests/futility/test_file_types.c
@@ -10,7 +10,7 @@
 
 #include "file_type.h"
 #include "futility.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /*
  * Files that exemplify each type.
diff --git a/tests/futility/test_not_really.c b/tests/futility/test_not_really.c
index 3cfc3ed6..9bffb1a1 100644
--- a/tests/futility/test_not_really.c
+++ b/tests/futility/test_not_really.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 
 #include "2struct.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/tests/gpt_misc_tests.c b/tests/gpt_misc_tests.c
index e0a8d56e..30632991 100644
--- a/tests/gpt_misc_tests.c
+++ b/tests/gpt_misc_tests.c
@@ -8,8 +8,8 @@
 #include "2api.h"
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
+#include "common/tests.h"
 #include "gpt.h"
-#include "test_common.h"
 
 #define LOGCALL(fmt, args...) sprintf(call_log + strlen(call_log), fmt, ##args)
 #define TEST_CALLS(expect_log) TEST_STR_EQ(call_log, expect_log, "  calls")
diff --git a/tests/hmac_test.c b/tests/hmac_test.c
index ed77d7bb..708711fd 100644
--- a/tests/hmac_test.c
+++ b/tests/hmac_test.c
@@ -10,7 +10,7 @@
 
 #include "2sha.h"
 #include "2hmac.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 const char short_key[] = "key";
 const char message[] = "The quick brown fox jumps over the lazy dog";
diff --git a/tests/sha_benchmark.c b/tests/sha_benchmark.c
index 27b1c101..d7ba31ab 100644
--- a/tests/sha_benchmark.c
+++ b/tests/sha_benchmark.c
@@ -10,8 +10,8 @@
 #include "2common.h"
 #include "2sha.h"
 #include "2sysincludes.h"
+#include "common/timer_utils.h"
 #include "host_common.h"
-#include "timer_utils.h"
 
 #define TEST_BUFFER_SIZE 4000000
 
diff --git a/tests/subprocess_tests.c b/tests/subprocess_tests.c
index 75d6e493..d65618f4 100644
--- a/tests/subprocess_tests.c
+++ b/tests/subprocess_tests.c
@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include "subprocess.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 #define TEST_STRING "hello world"
 #define TEST_STRING_LN TEST_STRING "\n"
diff --git a/tests/tlcl_tests.c b/tests/tlcl_tests.c
index 328abbed..62d34afc 100644
--- a/tests/tlcl_tests.c
+++ b/tests/tlcl_tests.c
@@ -11,8 +11,8 @@
 #include <string.h>
 
 #include "2api.h"
+#include "common/tests.h"
 #include "host_common.h"
-#include "test_common.h"
 #include "tlcl.h"
 #include "tlcl_internal.h"
 
diff --git a/tests/tpm_lite/tpmtest_fastenable.c b/tests/tpm_lite/tpmtest_fastenable.c
index a93dfd77..226a41f2 100644
--- a/tests/tpm_lite/tpmtest_fastenable.c
+++ b/tests/tpm_lite/tpmtest_fastenable.c
@@ -15,7 +15,7 @@
 #include <stdio.h>
 
 #include "host_common.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "tlcl.h"
 #include "tlcl_tests.h"
 
diff --git a/tests/tpm_lite/tpmtest_globallock.c b/tests/tpm_lite/tpmtest_globallock.c
index 14f16de0..52f7c8ea 100644
--- a/tests/tpm_lite/tpmtest_globallock.c
+++ b/tests/tpm_lite/tpmtest_globallock.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 #include "host_common.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "tlcl.h"
 #include "tlcl_tests.h"
 
diff --git a/tests/tpm_lite/tpmtest_redefine_unowned.c b/tests/tpm_lite/tpmtest_redefine_unowned.c
index 0f89870d..45bcd933 100644
--- a/tests/tpm_lite/tpmtest_redefine_unowned.c
+++ b/tests/tpm_lite/tpmtest_redefine_unowned.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 #include "host_common.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "tlcl.h"
 #include "tlcl_tests.h"
 
diff --git a/tests/tpm_lite/tpmtest_spaceperm.c b/tests/tpm_lite/tpmtest_spaceperm.c
index 8c9232b2..70f2b992 100644
--- a/tests/tpm_lite/tpmtest_spaceperm.c
+++ b/tests/tpm_lite/tpmtest_spaceperm.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 #include "host_common.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "tlcl.h"
 #include "tlcl_tests.h"
 
diff --git a/tests/tpm_lite/tpmtest_writelimit.c b/tests/tpm_lite/tpmtest_writelimit.c
index 05e4a178..71562b06 100644
--- a/tests/tpm_lite/tpmtest_writelimit.c
+++ b/tests/tpm_lite/tpmtest_writelimit.c
@@ -12,7 +12,7 @@
 
 #include "2common.h"
 #include "host_common.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "tlcl.h"
 #include "tlcl_tests.h"
 
diff --git a/tests/vb20_api_kernel_tests.c b/tests/vb20_api_kernel_tests.c
index b835251f..bc585b48 100644
--- a/tests/vb20_api_kernel_tests.c
+++ b/tests/vb20_api_kernel_tests.c
@@ -14,7 +14,7 @@
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "vboot_struct.h"
 
 /* Common context for tests */
diff --git a/tests/vb20_kernel_tests.c b/tests/vb20_kernel_tests.c
index 8766114a..05f21ab6 100644
--- a/tests/vb20_kernel_tests.c
+++ b/tests/vb20_kernel_tests.c
@@ -14,7 +14,7 @@
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Common context for tests */
 static uint8_t workbuf[VB2_KERNEL_WORKBUF_RECOMMENDED_SIZE]
diff --git a/tests/vb20_rsa_padding_tests.c b/tests/vb20_rsa_padding_tests.c
index 90ff42ae..68c32a9a 100644
--- a/tests/vb20_rsa_padding_tests.c
+++ b/tests/vb20_rsa_padding_tests.c
@@ -9,10 +9,10 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "file_keys.h"
 #include "host_key.h"
 #include "rsa_padding_test.h"
-#include "test_common.h"
 
 vb2_error_t hwcrypto_modexp_return_value = VB2_SUCCESS;
 vb2_error_t vb2ex_hwcrypto_modexp(const struct vb2_public_key *key,
diff --git a/tests/vb21_host_common2_tests.c b/tests/vb21_host_common2_tests.c
index b2ceb95f..61ba9866 100644
--- a/tests/vb21_host_common2_tests.c
+++ b/tests/vb21_host_common2_tests.c
@@ -12,11 +12,11 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "host_common21.h"
 #include "host_key21.h"
 #include "host_signature21.h"
-#include "test_common.h"
 #include "util_misc.h"
 
 static const uint8_t test_data[] = "This is some test data to sign.";
diff --git a/tests/vb21_host_common_tests.c b/tests/vb21_host_common_tests.c
index 3ab5dbc3..385a0c2c 100644
--- a/tests/vb21_host_common_tests.c
+++ b/tests/vb21_host_common_tests.c
@@ -8,10 +8,10 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common21.h"
 #include "host_key21.h"
 #include "host_signature21.h"
-#include "test_common.h"
 
 static const uint8_t test_data[] = "This is some test data to sign.";
 
diff --git a/tests/vb21_host_key_tests.c b/tests/vb21_host_key_tests.c
index e8eef9b3..e0a11055 100644
--- a/tests/vb21_host_key_tests.c
+++ b/tests/vb21_host_key_tests.c
@@ -11,10 +11,10 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "host_common21.h"
 #include "host_key21.h"
-#include "test_common.h"
 
 /* Test only the algorithms we use */
 struct alg_combo {
diff --git a/tests/vb21_host_misc_tests.c b/tests/vb21_host_misc_tests.c
index f437803c..dbf12e0c 100644
--- a/tests/vb21_host_misc_tests.c
+++ b/tests/vb21_host_misc_tests.c
@@ -10,10 +10,10 @@
 
 #include "2common.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "host_common21.h"
 #include "host_misc.h"
-#include "test_common.h"
 
 static void misc_tests(void)
 {
diff --git a/tests/vb21_host_sig_tests.c b/tests/vb21_host_sig_tests.c
index f337eaa4..4a9abffa 100644
--- a/tests/vb21_host_sig_tests.c
+++ b/tests/vb21_host_sig_tests.c
@@ -11,11 +11,11 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "host_common21.h"
 #include "host_key21.h"
 #include "host_signature21.h"
-#include "test_common.h"
 
 /* Test only the algorithms we use */
 struct alg_combo {
diff --git a/tests/vb2_api_tests.c b/tests/vb2_api_tests.c
index ff7fa18c..ca2f7e93 100644
--- a/tests/vb2_api_tests.c
+++ b/tests/vb2_api_tests.c
@@ -14,7 +14,7 @@
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Common context for tests */
 
diff --git a/tests/vb2_auxfw_sync_tests.c b/tests/vb2_auxfw_sync_tests.c
index 9cd4999d..bb236be8 100644
--- a/tests/vb2_auxfw_sync_tests.c
+++ b/tests/vb2_auxfw_sync_tests.c
@@ -13,9 +13,9 @@
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"
-#include "test_common.h"
 #include "vboot_struct.h"
 
 /* Mock data */
diff --git a/tests/vb2_common2_tests.c b/tests/vb2_common2_tests.c
index 5f065f8f..e793e57a 100644
--- a/tests/vb2_common2_tests.c
+++ b/tests/vb2_common2_tests.c
@@ -12,10 +12,10 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "file_keys.h"
 #include "host_common.h"
 #include "host_key21.h"
-#include "test_common.h"
 
 static const uint8_t test_data[] = "This is some test data to sign.";
 static const uint32_t test_size = sizeof(test_data);
diff --git a/tests/vb2_common3_tests.c b/tests/vb2_common3_tests.c
index 58052040..8e7a20c6 100644
--- a/tests/vb2_common3_tests.c
+++ b/tests/vb2_common3_tests.c
@@ -10,12 +10,12 @@
 #include "2common.h"
 #include "2rsa.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "file_keys.h"
 #include "host_common.h"
 #include "host_keyblock.h"
 #include "host_key.h"
 #include "host_signature.h"
-#include "test_common.h"
 
 static void resign_keyblock(struct vb2_keyblock *h,
 			    const struct vb2_private_key *key)
diff --git a/tests/vb2_common_tests.c b/tests/vb2_common_tests.c
index d76c4023..beb84610 100644
--- a/tests/vb2_common_tests.c
+++ b/tests/vb2_common_tests.c
@@ -7,7 +7,7 @@
 
 #include "2common.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "vboot_struct.h"  /* For old struct sizes */
 
 /* Mock data */
diff --git a/tests/vb2_crypto_tests.c b/tests/vb2_crypto_tests.c
index c7d66760..6696feb2 100644
--- a/tests/vb2_crypto_tests.c
+++ b/tests/vb2_crypto_tests.c
@@ -12,7 +12,7 @@
 #include "2rsa.h"
 #include "2sha.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "vboot_host.h"
 
 static void hash_algorithm_name_tests(void)
diff --git a/tests/vb2_ec_sync_tests.c b/tests/vb2_ec_sync_tests.c
index f4631b7f..4afc5ef0 100644
--- a/tests/vb2_ec_sync_tests.c
+++ b/tests/vb2_ec_sync_tests.c
@@ -10,9 +10,9 @@
 #include "2nvstorage.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"
-#include "test_common.h"
 #include "vboot_struct.h"
 
 /* Mock data */
diff --git a/tests/vb2_firmware_tests.c b/tests/vb2_firmware_tests.c
index 681e5d67..933f6085 100644
--- a/tests/vb2_firmware_tests.c
+++ b/tests/vb2_firmware_tests.c
@@ -14,7 +14,7 @@
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Common context for tests */
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
diff --git a/tests/vb2_gbb_tests.c b/tests/vb2_gbb_tests.c
index 047fa423..51ebcf6a 100644
--- a/tests/vb2_gbb_tests.c
+++ b/tests/vb2_gbb_tests.c
@@ -7,7 +7,7 @@
 
 #include "2common.h"
 #include "2misc.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Mock data */
 static char gbb_data[4096 + sizeof(struct vb2_gbb_header)];
diff --git a/tests/vb2_host_flashrom_tests.c b/tests/vb2_host_flashrom_tests.c
index 815657d4..7cebc5ed 100644
--- a/tests/vb2_host_flashrom_tests.c
+++ b/tests/vb2_host_flashrom_tests.c
@@ -18,10 +18,10 @@
 
 #include "2common.h"
 #include "2return_codes.h"
+#include "common/tests.h"
 #include "host_misc.h"
 #include "flashrom.h"
 #include "subprocess.h"
-#include "test_common.h"
 
 #define MOCK_TMPFILE_NAME "/tmp/vb2_unittest"
 #define MOCK_ROM_CONTENTS "bloop123"
diff --git a/tests/vb2_host_key_tests.c b/tests/vb2_host_key_tests.c
index 82dd3572..9c6fe284 100644
--- a/tests/vb2_host_key_tests.c
+++ b/tests/vb2_host_key_tests.c
@@ -6,8 +6,8 @@
  */
 
 #include "2common.h"
+#include "common/tests.h"
 #include "host_common.h"
-#include "test_common.h"
 
 /* Public key utility functions */
 static void public_key_tests(void)
diff --git a/tests/vb2_host_nvdata_flashrom_tests.c b/tests/vb2_host_nvdata_flashrom_tests.c
index 068b23a4..719f1d19 100644
--- a/tests/vb2_host_nvdata_flashrom_tests.c
+++ b/tests/vb2_host_nvdata_flashrom_tests.c
@@ -17,9 +17,9 @@
 #include "2constants.h"
 #include "2nvstorage.h"
 #include "2return_codes.h"
+#include "common/tests.h"
 #include "crossystem_vbnv.h"
 #include "flashrom.h"
-#include "test_common.h"
 
 /* Mocked flashrom only supports host programmer, and RW_NVRAM
    region. */
diff --git a/tests/vb2_kernel2_tests.c b/tests/vb2_kernel2_tests.c
index f42c0f78..b3477411 100644
--- a/tests/vb2_kernel2_tests.c
+++ b/tests/vb2_kernel2_tests.c
@@ -11,9 +11,9 @@
 #include "2nvstorage.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "host_common.h"
 #include "load_kernel_fw.h"
-#include "test_common.h"
 #include "tlcl.h"
 #include "tss_constants.h"
 #include "vboot_struct.h"
diff --git a/tests/vb2_kernel_tests.c b/tests/vb2_kernel_tests.c
index d5e6b55a..5d857e4e 100644
--- a/tests/vb2_kernel_tests.c
+++ b/tests/vb2_kernel_tests.c
@@ -12,7 +12,7 @@
 #include "2rsa.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 #include "vboot_struct.h"
 #include "vboot_api.h"
 
diff --git a/tests/vb2_misc2_tests.c b/tests/vb2_misc2_tests.c
index a4ed5789..403e2f6f 100644
--- a/tests/vb2_misc2_tests.c
+++ b/tests/vb2_misc2_tests.c
@@ -9,7 +9,7 @@
 #include "2common.h"
 #include "2misc.h"
 #include "2nvstorage.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Mock data */
 
diff --git a/tests/vb2_misc_tests.c b/tests/vb2_misc_tests.c
index 99f8bae4..d882743f 100644
--- a/tests/vb2_misc_tests.c
+++ b/tests/vb2_misc_tests.c
@@ -11,7 +11,7 @@
 #include "2nvstorage.h"
 #include "2secdata.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Common context for tests */
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
diff --git a/tests/vb2_nvstorage_tests.c b/tests/vb2_nvstorage_tests.c
index 94bcfcab..8734f72f 100644
--- a/tests/vb2_nvstorage_tests.c
+++ b/tests/vb2_nvstorage_tests.c
@@ -16,7 +16,7 @@
 #include "2nvstorage_fields.h"
 #include "2nvstorage.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 /* Single NV storage field to test */
 struct nv_field {
diff --git a/tests/vb2_recovery_reasons_tests.c b/tests/vb2_recovery_reasons_tests.c
index 5def4d21..8d05862b 100644
--- a/tests/vb2_recovery_reasons_tests.c
+++ b/tests/vb2_recovery_reasons_tests.c
@@ -6,7 +6,7 @@
  */
 
 #include "2recovery_reasons.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 static void get_recovery_reason_string_tests(void)
 {
diff --git a/tests/vb2_rsa_utility_tests.c b/tests/vb2_rsa_utility_tests.c
index 18347348..057b4b09 100644
--- a/tests/vb2_rsa_utility_tests.c
+++ b/tests/vb2_rsa_utility_tests.c
@@ -10,9 +10,9 @@
 #include "2rsa.h"
 #include "2rsa_private.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "file_keys.h"
 #include "rsa_padding_test.h"
-#include "test_common.h"
 #include "vboot_api.h"
 
 /**
diff --git a/tests/vb2_secdata_firmware_tests.c b/tests/vb2_secdata_firmware_tests.c
index c1b0a73f..0520cc0f 100644
--- a/tests/vb2_secdata_firmware_tests.c
+++ b/tests/vb2_secdata_firmware_tests.c
@@ -12,7 +12,7 @@
 #include "2secdata.h"
 #include "2secdata_struct.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__((aligned(VB2_WORKBUF_ALIGN)));
diff --git a/tests/vb2_secdata_fwmp_tests.c b/tests/vb2_secdata_fwmp_tests.c
index 79b0f55f..eabe671c 100644
--- a/tests/vb2_secdata_fwmp_tests.c
+++ b/tests/vb2_secdata_fwmp_tests.c
@@ -9,7 +9,7 @@
 #include "2misc.h"
 #include "2secdata.h"
 #include "2secdata_struct.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__((aligned(VB2_WORKBUF_ALIGN)));
diff --git a/tests/vb2_secdata_kernel_tests.c b/tests/vb2_secdata_kernel_tests.c
index 5ac63ee5..a84e04e1 100644
--- a/tests/vb2_secdata_kernel_tests.c
+++ b/tests/vb2_secdata_kernel_tests.c
@@ -12,7 +12,7 @@
 #include "2secdata.h"
 #include "2secdata_struct.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 static uint8_t workbuf[VB2_FIRMWARE_WORKBUF_RECOMMENDED_SIZE]
 	__attribute__((aligned(VB2_WORKBUF_ALIGN)));
diff --git a/tests/vb2_sha256_x86_tests.c b/tests/vb2_sha256_x86_tests.c
index 06ba12e1..e17d3951 100644
--- a/tests/vb2_sha256_x86_tests.c
+++ b/tests/vb2_sha256_x86_tests.c
@@ -10,8 +10,8 @@
 
 #include "2api.h"
 #include "2sha.h"
+#include "common/tests.h"
 #include "sha_test_vectors.h"
-#include "test_common.h"
 
 vb2_error_t vb2_digest_buffer(const uint8_t *buf, uint32_t size,
 			      enum vb2_hash_algorithm hash_alg, uint8_t *digest,
diff --git a/tests/vb2_sha_api_tests.c b/tests/vb2_sha_api_tests.c
index cb58f7bc..6ed0b74b 100644
--- a/tests/vb2_sha_api_tests.c
+++ b/tests/vb2_sha_api_tests.c
@@ -8,7 +8,7 @@
 #include "2return_codes.h"
 #include "2sha.h"
 #include "2sysincludes.h"
-#include "test_common.h"
+#include "common/tests.h"
 
 uint8_t mock_sha1[] = {0x1, 0x3, 0x5, 0x2, 0x4, 0x6, 0xa, 0xb, 0xc, 0xd,
 		       0xd, 0xe, 0xa, 0xd, 0xb, 0xe, 0xe, 0xf, 0x0, 0xf0};
diff --git a/tests/vb2_sha_tests.c b/tests/vb2_sha_tests.c
index a14af65c..40cf42f5 100644
--- a/tests/vb2_sha_tests.c
+++ b/tests/vb2_sha_tests.c
@@ -11,8 +11,8 @@
 #include "2rsa.h"
 #include "2sha.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "sha_test_vectors.h"
-#include "test_common.h"
 
 static void sha1_tests(void)
 {
diff --git a/tests/vboot_api_kernel_tests.c b/tests/vboot_api_kernel_tests.c
index f885cd86..5c1d0182 100644
--- a/tests/vboot_api_kernel_tests.c
+++ b/tests/vboot_api_kernel_tests.c
@@ -9,8 +9,8 @@
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2sysincludes.h"
+#include "common/tests.h"
 #include "load_kernel_fw.h"
-#include "test_common.h"
 #include "vboot_api.h"
 
 #define MAX_TEST_DISKS 10
diff --git a/tests/vboot_kernel2_tests.c b/tests/vboot_kernel2_tests.c
index bbebf386..d402969c 100644
--- a/tests/vboot_kernel2_tests.c
+++ b/tests/vboot_kernel2_tests.c
@@ -10,8 +10,8 @@
 #include "2misc.h"
 #include "2nvstorage.h"
 #include "2secdata.h"
+#include "common/tests.h"
 #include "load_kernel_fw.h"
-#include "test_common.h"
 #include "vboot_api.h"
 
 #define MAX_MOCK_KERNELS 10
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c
index 1f77cc5c..afeb08d7 100644
--- a/tests/vboot_kernel_tests.c
+++ b/tests/vboot_kernel_tests.c
@@ -13,9 +13,9 @@
 #include "2secdata_struct.h"
 #include "cgptlib.h"
 #include "cgptlib_internal.h"
+#include "common/tests.h"
 #include "gpt.h"
 #include "load_kernel_fw.h"
-#include "test_common.h"
 #include "vboot_api.h"
 
 /* Mock kernel partition */