diff --git a/configure.ac b/configure.ac
index eae8907d47..eb047d6671 100644
--- a/configure.ac
+++ b/configure.ac
@@ -409,7 +409,7 @@ LIBVIRT_ARG_WITH([VBOX], [VirtualBox XPCOMC], [yes])
 LIBVIRT_DRIVER_ARG_LXC
 LIBVIRT_ARG_WITH([ESX], [ESX], [check])
 LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
-LIBVIRT_ARG_WITH([TEST], [test driver], [yes])
+LIBVIRT_DRIVER_ARG_TEST
 LIBVIRT_ARG_WITH([REMOTE], [remote driver], [yes])
 LIBVIRT_ARG_WITH([LIBVIRTD], [libvirtd], [yes])
 
@@ -476,11 +476,7 @@ fi
 AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"])
 
 LIBVIRT_DRIVER_CHECK_QEMU
-
-if test "$with_test" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled])
-fi
-AM_CONDITIONAL([WITH_TEST], [test "$with_test" = "yes"])
+LIBVIRT_DRIVER_CHECK_TEST
 
 if test "$with_remote" = "yes" ; then
     AC_DEFINE_UNQUOTED([WITH_REMOTE], 1, [whether Remote driver is enabled])
@@ -1373,7 +1369,7 @@ AC_MSG_NOTICE([      ESX: $with_esx])
 AC_MSG_NOTICE([  Hyper-V: $with_hyperv])
 LIBVIRT_DRIVER_RESULT_VZ
 LIBVIRT_DRIVER_RESULT_BHYVE
-AC_MSG_NOTICE([     Test: $with_test])
+LIBVIRT_DRIVER_RESULT_TEST
 AC_MSG_NOTICE([   Remote: $with_remote])
 AC_MSG_NOTICE([  Network: $with_network])
 AC_MSG_NOTICE([ Libvirtd: $with_libvirtd])
diff --git a/m4/virt-driver-test.m4 b/m4/virt-driver-test.m4
new file mode 100644
index 0000000000..fd218f0280
--- /dev/null
+++ b/m4/virt-driver-test.m4
@@ -0,0 +1,33 @@
+dnl The test driver
+dnl
+dnl Copyright (C) 2016 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_DRIVER_ARG_TEST], [
+  LIBVIRT_ARG_WITH([TEST], [test driver], [yes])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_CHECK_TEST], [
+  if test "$with_test" = "yes" ; then
+    AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled])
+  fi
+  AM_CONDITIONAL([WITH_TEST], [test "$with_test" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_RESULT_TEST], [
+  LIBVIRT_RESULT([Test], [$with_test])
+])