diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 7d078cff91c..272db40d10b 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -65,8 +65,7 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/src \
 	-I$(top_builddir)/src/compiler \
 	-I$(top_builddir)/src/compiler/nir \
-	-I$(top_builddir)/src/intel \
-	-I$(top_builddir)/src/vulkan
+	-I$(top_builddir)/src/intel
 
 libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init
 
@@ -198,7 +197,10 @@ libvulkan_test_la_SOURCES =                             \
 	$(VULKAN_SOURCES)                               \
 	anv_gem_stubs.c
 
-libvulkan_test_la_CFLAGS = $(libvulkan_la_CFLAGS)
-libvulkan_test_la_LIBADD = $(libvulkan_la_LIBADD)
+libvulkan_test_la_CFLAGS =                              \
+	-I$(top_srcdir)/src/intel/vulkan                \
+	$(libvulkan_intel_la_CFLAGS)
+
+libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD)
 
 include $(top_srcdir)/install-lib-links.mk
diff --git a/src/intel/vulkan/tests/Makefile.am b/src/intel/vulkan/tests/Makefile.am
index 883013d86c6..ddff73c1707 100644
--- a/src/intel/vulkan/tests/Makefile.am
+++ b/src/intel/vulkan/tests/Makefile.am
@@ -30,11 +30,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/mesa/drivers/dri/i965 \
 	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/isl/ \
-	-I$(top_srcdir)/src/vulkan
+	-I$(top_srcdir)/src/intel \
+	-I$(top_srcdir)/src/intel/vulkan \
+	-I$(top_builddir)/src/intel/vulkan
 
 LDADD = \
-	$(top_builddir)/src/vulkan/libvulkan-test.la \
+	$(top_builddir)/src/intel/vulkan/libvulkan-test.la \
 	$(PTHREAD_LIBS) -lm -lstdc++
 
 check_PROGRAMS = \