diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 5438db5cbe..8d6780f677 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -43,7 +43,7 @@ from nova.tests.glance import stubs as glance_stubs
 from nova.tests import fake_network
 from nova.tests import fake_utils
 from nova import utils
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import volume_utils
 from nova.virt.xenapi import vmops
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 58e6cf2783..b13d2b0e3f 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -20,7 +20,7 @@ import random
 
 from eventlet import tpool
 
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import fake
 from nova.virt.xenapi import volume_utils
 from nova.virt.xenapi import vm_utils
diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index 2a13f192b3..b8a8c26cc5 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -28,7 +28,7 @@ from nova.virt import driver
 from nova.virt import fake
 from nova.virt.libvirt import connection as libvirt_conn
 from nova.virt import vmwareapi_conn
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi/connection.py
similarity index 100%
rename from nova/virt/xenapi_conn.py
rename to nova/virt/xenapi/connection.py
diff --git a/nova/volume/xensm.py b/nova/volume/xensm.py
index bf390cafb9..f998dae28b 100644
--- a/nova/volume/xensm.py
+++ b/nova/volume/xensm.py
@@ -16,7 +16,7 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import utils
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 from nova.virt.xenapi import volumeops
 import nova.volume.driver
 
diff --git a/tools/xenserver/vm_vdi_cleaner.py b/tools/xenserver/vm_vdi_cleaner.py
index 6b9213e404..e99b90367a 100755
--- a/tools/xenserver/vm_vdi_cleaner.py
+++ b/tools/xenserver/vm_vdi_cleaner.py
@@ -27,7 +27,7 @@ from nova import exception
 from nova import flags
 from nova import utils
 
-from nova.virt import xenapi_conn
+from nova.virt.xenapi import connection as xenapi_conn
 
 
 flags.DECLARE("resize_confirm_window", "nova.compute.manager")