diff --git a/configure.ac b/configure.ac
index 0cfcd7e8afdb0ab7e4758c6e94c6d71e3623f26b..0710c9bd2be7b218899a9fe1a92139472998e41e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,10 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then
     sysconfdir='/etc'
 fi
 
-dnl Allow to build without Xen, QEMU/KVM, test or remote driver
+dnl
+dnl Virtualization drivers check
+dnl
+
 LIBVIRT_DRIVER_ARG_XEN
 LIBVIRT_DRIVER_ARG_QEMU
 LIBVIRT_DRIVER_ARG_OPENVZ
@@ -405,11 +408,39 @@ LIBVIRT_DRIVER_ARG_XENAPI
 LIBVIRT_DRIVER_ARG_LIBXL
 LIBVIRT_DRIVER_ARG_VBOX
 LIBVIRT_DRIVER_ARG_LXC
+LIBVIRT_DRIVER_ARG_VZ
+LIBVIRT_DRIVER_ARG_BHYVE
+LIBVIRT_DRIVER_ARG_UML
 LIBVIRT_DRIVER_ARG_ESX
 LIBVIRT_DRIVER_ARG_HYPERV
 LIBVIRT_DRIVER_ARG_TEST
 LIBVIRT_DRIVER_ARG_REMOTE
 LIBVIRT_DRIVER_ARG_LIBVIRTD
+LIBVIRT_DRIVER_ARG_NETWORK
+LIBVIRT_DRIVER_ARG_INTERFACE
+
+LIBVIRT_DRIVER_CHECK_XEN
+LIBVIRT_DRIVER_CHECK_QEMU
+LIBVIRT_DRIVER_CHECK_OPENVZ
+LIBVIRT_DRIVER_CHECK_VMWARE
+LIBVIRT_DRIVER_CHECK_PHYP
+LIBVIRT_DRIVER_CHECK_XENAPI
+LIBVIRT_DRIVER_CHECK_LIBXL
+LIBVIRT_DRIVER_CHECK_VBOX
+LIBVIRT_DRIVER_CHECK_LXC
+LIBVIRT_DRIVER_CHECK_VZ
+LIBVIRT_DRIVER_CHECK_BHYVE
+LIBVIRT_DRIVER_CHECK_UML
+LIBVIRT_DRIVER_CHECK_ESX
+LIBVIRT_DRIVER_CHECK_HYPERV
+LIBVIRT_DRIVER_CHECK_TEST
+LIBVIRT_DRIVER_CHECK_REMOTE
+LIBVIRT_DRIVER_CHECK_LIBVIRTD
+LIBVIRT_DRIVER_CHECK_NETWORK
+LIBVIRT_DRIVER_CHECK_INTERFACE
+
+AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
+
 
 dnl
 dnl in case someone want to build static binaries
@@ -450,44 +481,16 @@ LIBVIRT_CHECK_TLS_PRIORITY
 LIBVIRT_CHECK_SYSCTL_CONFIG
 
 
-LIBVIRT_DRIVER_CHECK_OPENVZ
-LIBVIRT_DRIVER_CHECK_VMWARE
-
-
-LIBVIRT_DRIVER_CHECK_VBOX
-LIBVIRT_DRIVER_CHECK_QEMU
-LIBVIRT_DRIVER_CHECK_TEST
-LIBVIRT_DRIVER_CHECK_REMOTE
-LIBVIRT_DRIVER_CHECK_LIBVIRTD
-LIBVIRT_DRIVER_CHECK_XENAPI
-LIBVIRT_DRIVER_CHECK_LIBXL
-LIBVIRT_DRIVER_CHECK_XEN
 
-AM_CONDITIONAL([WITH_XENCONFIG], [test "$with_libxl" = "yes" || test "$with_xen" = "yes"])
 
 dnl
 dnl check for kvm headers
 dnl
 AC_CHECK_HEADERS([linux/kvm.h])
 
-LIBVIRT_DRIVER_CHECK_LXC
 
 AM_CONDITIONAL([WITH_SETUID_RPC_CLIENT], [test "$with_lxc$with_login_shell" != "nono"])
 
-dnl
-dnl Checks for the Parallels driver
-dnl
-
-LIBVIRT_DRIVER_ARG_VZ
-LIBVIRT_DRIVER_CHECK_VZ
-
-dnl
-dnl Checks for bhyve driver
-dnl
-
-LIBVIRT_DRIVER_ARG_BHYVE
-LIBVIRT_DRIVER_CHECK_BHYVE
-
 
 dnl
 dnl check for kernel headers required by src/bridge.c
@@ -590,24 +593,6 @@ if test "$with_apparmor" = "no"; then
 fi
 AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles" != "no"])
 
-dnl
-dnl Checks for the UML driver
-dnl
-
-LIBVIRT_DRIVER_ARG_UML
-LIBVIRT_DRIVER_CHECK_UML
-
-dnl
-dnl check for PHYP
-dnl
-
-LIBVIRT_DRIVER_CHECK_PHYP
-
-dnl check if the network driver should be compiled
-
-LIBVIRT_DRIVER_ARG_NETWORK
-LIBVIRT_DRIVER_CHECK_NETWORK
-
 
 LIBVIRT_ARG_WITH([SECRETS], [local secrets management driver], [yes])
 
@@ -944,18 +929,6 @@ if test $with_storage = yes; then
 fi
 AM_CONDITIONAL([WITH_STORAGE], [test "$with_storage" = "yes"])
 
-dnl
-dnl check for (ESX)
-dnl
-
-LIBVIRT_DRIVER_CHECK_ESX
-
-dnl
-dnl check for Hyper-V
-dnl
-
-LIBVIRT_DRIVER_CHECK_HYPERV
-
 dnl
 dnl check for kernel headers required by btrfs ioctl
 dnl
@@ -1110,11 +1083,6 @@ then
 fi
 AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"])
 
-dnl check if the interface driver should be compiled
-LIBVIRT_DRIVER_ARG_INTERFACE
-LIBVIRT_DRIVER_CHECK_INTERFACE
-
-
 dnl GET_VLAN_VID_CMD is required for virNetDevGetVLanID
 AC_CHECK_DECLS([GET_VLAN_VID_CMD], [], [], [[#include <linux/if_vlan.h>]])