diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 9cddb2e4323..e91e3477b0b 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -951,7 +951,7 @@ public class LibvirtVMDef {
             if (_listenAddr != null) {
                 graphicBuilder.append(" listen='" + _listenAddr + "'");
             } else {
-                graphicBuilder.append(" listen='' ");
+                graphicBuilder.append(" listen=''");
             }
             if (_passwd != null) {
                 graphicBuilder.append(" passwd='" + _passwd + "'");
diff --git a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 0bafd073f68..c82c31fc510 100644
--- a/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ b/plugins/hypervisors/kvm/test/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -80,7 +80,7 @@ public class LibvirtComputingResourceTest {
         vmStr += "<serial type='pty'>\n";
         vmStr += "<target port='0'/>\n";
         vmStr += "</serial>\n";
-        vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "' />\n";
+        vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "' passwd='" + vncPassword + "'/>\n";
         vmStr += "<console type='pty'>\n";
         vmStr += "<target port='0'/>\n";
         vmStr += "</console>\n";
@@ -156,7 +156,7 @@ public class LibvirtComputingResourceTest {
         vmStr += "<serial type='pty'>\n";
         vmStr += "<target port='0'/>\n";
         vmStr += "</serial>\n";
-        vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "' />\n";
+        vmStr += "<graphics type='vnc' autoport='yes' listen='" + vncAddr + "' passwd='" + vncPassword + "'/>\n";
         vmStr += "<console type='pty'>\n";
         vmStr += "<target port='0'/>\n";
         vmStr += "</console>\n";