diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py
index 71c1e63d39..7a2eb142ce 100644
--- a/tools/python/xen/xm/create.py
+++ b/tools/python/xen/xm/create.py
@@ -787,8 +787,10 @@ def configure_disks(config_devs, vals):
     """Create the config for disks (virtual block devices).
     """
     for (uname, dev, mode, backend, protocol) in vals.disk:
-        if uname.startswith('tap:'):
+        if uname.startswith('tap2:'):
             cls = 'tap2'
+        elif uname.startswith('tap:'):
+            cls = 'tap'
         else:
             cls = 'vbd'
 
diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index de119996b8..33d734fe1c 100644
--- a/tools/python/xen/xm/main.py
+++ b/tools/python/xen/xm/main.py
@@ -2634,8 +2634,10 @@ def xm_usb_list_assignable_devices(args):
 def parse_block_configuration(args):
     dom = args[0]
 
-    if args[1].startswith('tap:'):
+    if args[1].startswith('tap2:'):
         cls = 'tap2'
+    elif args[1].startswith('tap:'):
+        cls = 'tap'
     else:
         cls = 'vbd'