diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 8726f5dcb4..a84d212dab 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1417,7 +1417,7 @@
 ####          soft reboot request is made. We fall back to hard reboot if
 ####          instance does not shutdown within this window.
 
-# libvirt_nonblocking=false
+# libvirt_nonblocking=true
 #### (BoolOpt) Use a separated OS thread pool to realize non-blocking
 ####           libvirt calls
 
diff --git a/nova/tests/fakelibvirt.py b/nova/tests/fakelibvirt.py
index 3e4c637198..4350a8878b 100644
--- a/nova/tests/fakelibvirt.py
+++ b/nova/tests/fakelibvirt.py
@@ -797,3 +797,9 @@ def openAuth(uri, auth, flags):
                           "this auth method"))
 
     return Connection(uri, readonly=False)
+
+
+virDomain = Domain
+
+
+virConnect = Connection
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 5db4204d55..ea0e60573d 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -156,7 +156,7 @@ libvirt_opts = [
                     ' soft reboot request is made. We fall back to hard reboot'
                     ' if instance does not shutdown within this window.'),
     cfg.BoolOpt('libvirt_nonblocking',
-                default=False,
+                default=True,
                 help='Use a separated OS thread pool to realize non-blocking'
                      ' libvirt calls'),
     # force_config_drive is a string option, to allow for future behaviors