diff --git a/configure.ac b/configure.ac
index 3770b2fc..859ebb23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,7 @@ if test "x$GCC" = "xyes"; then
 fi
 AC_SUBST(ASSEMBLER_WARN_CFLAGS)
 
+PKG_CHECK_MODULES(GBM, [gbm])
 PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.55 libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dcac2f32..6fd05823 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST = $(common_files)
 
 CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt
 
-AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
+AM_CFLAGS = $(GBM_CFLAGS) $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
 	-I$(srcdir)/.. \
 	-I$(srcdir)/../lib \
 	-include "$(srcdir)/../lib/check-ndebug.h" \
@@ -48,7 +48,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\
 	$(LIBUNWIND_CFLAGS) \
 	$(NULL)
 
-LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS)
+LDADD = ../lib/libintel_tools.la $(PCIACCESS_LIBS) $(GBM_LIBS) $(DRM_LIBS) $(LIBUNWIND_LIBS)
 
 LDADD += $(CAIRO_LIBS) $(LIBUDEV_LIBS) $(GLIB_LIBS) -lm
 AM_CFLAGS += $(CAIRO_CFLAGS) $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index c94714b6..7e93bd1b 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -165,6 +165,7 @@ TESTS_progs = \
 	kms_pwrite_crc \
 	kms_sink_crc_basic \
 	prime_udl \
+	vgem_fb_test \
 	$(NULL)
 
 # IMPORTANT: The ZZ_ tests need to be run last!