diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index f3a708af11..f45638da3f 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -35,8 +35,9 @@ TEST_CFLAGS := -include $(src)/include/kconfig.h \
 # Include generic test mock headers, before original ones
 TEST_CFLAGS += -I$(testsrc)/include/mocks -I$(testsrc)/include
 
-TEST_CFLAGS += -I$(src)/include -I$(src)/commonlib/include \
-	-I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include
+TEST_CFLAGS += -I$(src) -I$(src)/include -I$(src)/commonlib/include \
+	-I$(src)/commonlib/bsd/include -I$(src)/arch/x86/include \
+	-I$(top)/3rdparty/vboot/firmware/include
 
 # Note: This is intentionally just a subset of the warnings in the toplevel
 # Makefile.inc. We don't need to be as strict with test code, and things like
diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.inc
index 028db73add..45cef1b4ca 100644
--- a/tests/lib/Makefile.inc
+++ b/tests/lib/Makefile.inc
@@ -73,7 +73,6 @@ fmap-test-srcs += tests/stubs/console.c
 fmap-test-srcs += src/lib/boot_device.c
 fmap-test-srcs += src/commonlib/region.c
 fmap-test-cflags += -I tests/include/tests/lib/fmap
-fmap-test-cflags += -I 3rdparty/vboot/firmware/include
 
 imd_cbmem-ramstage-test-stage := ramstage
 imd_cbmem-ramstage-test-srcs += tests/lib/imd_cbmem-test.c
@@ -141,7 +140,6 @@ coreboot_table-test-srcs += src/lib/compute_ip_checksum.c
 coreboot_table-test-srcs += src/lib/coreboot_table.c
 coreboot_table-test-srcs += src/lib/imd_cbmem.c
 coreboot_table-test-srcs += src/lib/imd.c
-coreboot_table-test-cflags += -I src -I 3rdparty/vboot/firmware/include
 coreboot_table-test-cflags += -I tests/include/tests/lib/fmap
 coreboot_table-test-mocks += cbmem_top_chipset
 
@@ -175,8 +173,6 @@ cbmem_stage_cache-test-srcs += tests/stubs/console.c
 cbmem_stage_cache-test-srcs += src/lib/cbmem_stage_cache.c
 cbmem_stage_cache-test-srcs += src/lib/imd_cbmem.c
 cbmem_stage_cache-test-srcs += src/lib/imd.c
-cbmem_stage_cache-test-cflags += -I 3rdparty/vboot/firmware/include
-cbmem_stage_cache-test-cflags += -I $(src)/commonlib/include
 cbmem_stage_cache-test-config += CONFIG_CBMEM_STAGE_CACHE=1
 
 libgcc-test-srcs += tests/lib/libgcc-test.c