diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 7dc4ba8a18c..60030ae4f11 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -84,6 +84,11 @@ domr.scripts.dir=scripts/network/domr/kvm
 # set the hypervisor type, values are: kvm, lxc
 # hypervisor.type=kvm
 
+# set the hypervisor URI. Usually there is no need for changing this
+# For KVM: qemu:///system
+# For LXC: lxc:///
+# hypervisor.uri=qemu:///system
+
 # settings to enable direct networking in libvirt, should not be used
 # on hosts that run system vms, values for mode are: private, bridge, vepa
 # libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.DirectVifDriver
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index c34d1eb1821..f979cfe00e4 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3943,18 +3943,22 @@ ServerResource {
         final HashMap<String, State> vmStates = new HashMap<String, State>();
         Connect conn = null;
 
-        try {
-            conn = LibvirtConnection.getConnectionByType(HypervisorType.LXC.toString());
-            vmStates.putAll(getAllVms(conn));
-        } catch (LibvirtException e) {
-            s_logger.debug("Failed to get connection: " + e.getMessage());
+        if (_hypervisorType == HypervisorType.LXC) {
+            try {
+                conn = LibvirtConnection.getConnectionByType(HypervisorType.LXC.toString());
+                vmStates.putAll(getAllVms(conn));
+            } catch (LibvirtException e) {
+                s_logger.debug("Failed to get connection: " + e.getMessage());
+            }
         }
 
-        try {
-            conn = LibvirtConnection.getConnectionByType(HypervisorType.KVM.toString());
-            vmStates.putAll(getAllVms(conn));
-        } catch (LibvirtException e) {
-            s_logger.debug("Failed to get connection: " + e.getMessage());
+        if (_hypervisorType == HypervisorType.KVM) {
+            try {
+                conn = LibvirtConnection.getConnectionByType(HypervisorType.KVM.toString());
+                vmStates.putAll(getAllVms(conn));
+            } catch (LibvirtException e) {
+                s_logger.debug("Failed to get connection: " + e.getMessage());
+            }
         }
 
         return vmStates;