diff --git a/tests/cli-test-xml/compare/virt-install-many-devices.xml b/tests/cli-test-xml/compare/virt-install-many-devices.xml
index baa211417..45010e0ef 100644
--- a/tests/cli-test-xml/compare/virt-install-many-devices.xml
+++ b/tests/cli-test-xml/compare/virt-install-many-devices.xml
@@ -241,7 +241,7 @@
       <image compression="off"/>
       <listen type="socket"/>
     </graphics>
-    <graphics type="spice" autoport="no">
+    <graphics type="spice">
       <gl enable="yes"/>
       <image compression="off"/>
       <listen type="none"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-graphics-listen-none.xml b/tests/cli-test-xml/compare/virt-xml-edit-graphics-listen-none.xml
index c86e45b4f..539fcb390 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-graphics-listen-none.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-graphics-listen-none.xml
@@ -3,7 +3,7 @@
      </tpm>
 -    <graphics type="vnc" port="-1" autoport="yes">
 -      <listen type="address"/>
-+    <graphics type="vnc" autoport="no">
++    <graphics type="vnc">
 +      <listen type="none"/>
      </graphics>
      <sound model="sb16"/>
diff --git a/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml b/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
index 1fef55fb7..b748ecb77 100644
--- a/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
+++ b/tests/cli-test-xml/compare/virt-xml-edit-graphics-spice-gl.xml
@@ -3,7 +3,7 @@
      </tpm>
 -    <graphics type="vnc" port="-1" autoport="yes">
 -      <listen type="address"/>
-+    <graphics type="spice" autoport="no">
++    <graphics type="spice">
 +      <gl enable="yes"/>
 +      <listen type="none"/>
      </graphics>
diff --git a/virtinst/devicegraphics.py b/virtinst/devicegraphics.py
index 07b554e8a..277a020b8 100644
--- a/virtinst/devicegraphics.py
+++ b/virtinst/devicegraphics.py
@@ -228,7 +228,7 @@ class VirtualGraphics(VirtualDevice):
         self.remove_all_listens()
         self.port = None
         self.tlsPort = None
-        self.autoport = False
+        self.autoport = None
         self.socket = None
 
         if self.conn.check_support(