diff --git a/configure.ac b/configure.ac
index ee4ac721..59e8a346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,11 @@ AC_ARG_ENABLE(freedreno-experimental-api,
 	      [Enable support for freedreno's experimental API (default: disabled)]),
 	      [FREEDRENO=$enableval], [FREEDRENO=no])
 
+AC_ARG_ENABLE(install-test-programs,
+		  AS_HELP_STRING([--enable-install-test-programs],
+		  [Install test programs (default: no)]),
+		  [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no])
+
 dnl ===========================================================================
 dnl check compiler flags
 AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
@@ -211,6 +216,11 @@ if test "x$FREEDRENO" = xyes; then
 	AC_DEFINE(HAVE_FREEDRENO, 1, [Have freedreno support])
 fi
 
+AM_CONDITIONAL(HAVE_INSTALL_TESTS, [test "x$INSTALL_TESTS" = xyes])
+if test "x$INSTALL_TESTS" = xyes; then
+	AC_DEFINE(HAVE_INSTALL_TESTS, 1, [Install test programs])
+fi
+
 AC_ARG_ENABLE([cairo-tests],
               [AS_HELP_STRING([--enable-cairo-tests],
                               [Enable support for Cairo rendering in tests (default: auto)])],
diff --git a/tests/kmstest/Makefile.am b/tests/kmstest/Makefile.am
index ae562a10..7903a267 100644
--- a/tests/kmstest/Makefile.am
+++ b/tests/kmstest/Makefile.am
@@ -3,8 +3,13 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/libkms/ \
 	-I$(top_srcdir)
 
+if HAVE_INSTALL_TESTS
+bin_PROGRAMS = \
+	kmstest
+else
 noinst_PROGRAMS = \
 	kmstest
+endif
 
 kmstest_SOURCES = \
 	main.c
diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
index c4862acd..6420ef33 100644
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -2,8 +2,13 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)
 
+if HAVE_INSTALL_TESTS
+bin_PROGRAMS = \
+	modeprint
+else
 noinst_PROGRAMS = \
 	modeprint
+endif
 
 modeprint_SOURCES = \
 	modeprint.c
diff --git a/tests/modetest/Makefile.am b/tests/modetest/Makefile.am
index 065ae132..410c6326 100644
--- a/tests/modetest/Makefile.am
+++ b/tests/modetest/Makefile.am
@@ -3,8 +3,13 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/libkms/ \
 	-I$(top_srcdir)
 
+if HAVE_INSTALL_TESTS
+bin_PROGRAMS = \
+	modetest
+else
 noinst_PROGRAMS = \
 	modetest
+endif
 
 modetest_SOURCES = \
 	buffers.c modetest.c buffers.h
diff --git a/tests/vbltest/Makefile.am b/tests/vbltest/Makefile.am
index 77f90370..f99b6a23 100644
--- a/tests/vbltest/Makefile.am
+++ b/tests/vbltest/Makefile.am
@@ -1,9 +1,13 @@
 AM_CFLAGS = \
 	-I$(top_srcdir)/include/drm \
 	-I$(top_srcdir)
-
+if HAVE_INSTALL_TESTS
 noinst_PROGRAMS = \
 	vbltest
+else
+noinst_PROGRAMS = \
+	vbltest
+endif
 
 vbltest_SOURCES = \
 	vbltest.c