diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/_bittorrent_seeder b/plugins/xenserver/xenapi/etc/xapi.d/plugins/_bittorrent_seeder
index 3e566a9889..ba7aee485e 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/_bittorrent_seeder
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/_bittorrent_seeder
@@ -23,9 +23,11 @@ import time
 
 import libtorrent
 
-#FIXME(sirp): should this use pluginlib from 5.6?
-from pluginlib_nova import *
-configure_logging('_bittorrent_seeder')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('_bittorrent_seeder')
+logging = pluginlib_nova.logging
 
 
 def _daemonize(stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index 261edd406e..f74356ee12 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -28,19 +28,18 @@ try:
     import json
 except ImportError:
     import simplejson as json
-import os
-import random
-import subprocess
-import tempfile
 import time
 
 import XenAPIPlugin
 
-from pluginlib_nova import *
-configure_logging("agent")
+import pluginlib_nova
+pluginlib_nova.configure_logging("agent")
 import xenstore
 
+
 DEFAULT_TIMEOUT = 30
+PluginError = pluginlib_nova.PluginError
+_ = pluginlib_nova._
 
 
 class TimeoutError(StandardError):
@@ -164,7 +163,8 @@ def inject_file(self, arg_dict):
 
 def agent_update(self, arg_dict):
     """Expects an URL and md5sum of the contents, then directs the agent to
-    update itself."""
+    update itself.
+    """
     timeout = int(arg_dict.pop('timeout', DEFAULT_TIMEOUT))
     request_id = arg_dict["id"]
     url = arg_dict["url"]
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bandwidth b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bandwidth
index c488b07bd4..9b2b01cf87 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bandwidth
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bandwidth
@@ -17,13 +17,12 @@
 
 """Fetch Bandwidth data from VIF network devices."""
 
-import os
-import shutil
-
 import utils
 
-from pluginlib_nova import *
-configure_logging('bandwidth')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('bandwidth')
 
 
 def _read_proc_net():
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
index 28eb076ecc..a3d2769a6b 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
@@ -26,13 +26,15 @@ import time
 
 import libtorrent
 import urllib2
-import XenAPIPlugin
 
 import utils
 
-#FIXME(sirp): should this use pluginlib from 5.6?
-from pluginlib_nova import *
-configure_logging('bittorrent')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('bittorrent')
+logging = pluginlib_nova.logging
+
 
 DEFAULT_TORRENT_CACHE = '/images/torrents'
 DEFAULT_SEED_CACHE = '/images/seeds'
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/console b/plugins/xenserver/xenapi/etc/xapi.d/plugins/console
index afcb783f78..bb0936250e 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/console
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/console
@@ -29,7 +29,6 @@ as will be required after a log rotate:
 
 import base64
 import logging
-import os
 import zlib
 
 import XenAPIPlugin
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index e99a651981..d45adab1ac 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -26,9 +26,12 @@ import urllib2
 
 import utils
 
-#FIXME(sirp): should this use pluginlib from 5.6?
-from pluginlib_nova import *
-configure_logging('glance')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('glance')
+logging = pluginlib_nova.logging
+PluginError = pluginlib_nova.PluginError
 
 
 class RetryableError(Exception):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel b/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel
index 3aa5a443e6..24cb4025d2 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel
@@ -26,9 +26,15 @@ import shutil
 
 import XenAPIPlugin
 
-#FIXME(sirp): should this use pluginlib from 5.6?
-from pluginlib_nova import *
-configure_logging('kernel')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('kernel')
+logging = pluginlib_nova.logging
+exists = pluginlib_nova.exists
+optional = pluginlib_nova.optional
+with_vdi_in_dom0 = pluginlib_nova.with_vdi_in_dom0
+
 
 KERNEL_DIR = '/boot/guest'
 
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index 7906887376..02f6c2a54a 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
@@ -20,8 +20,11 @@ XenAPI Plugin for transferring data between host nodes
 """
 import utils
 
-from pluginlib_nova import *
-configure_logging('migration')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('migration')
+logging = pluginlib_nova.logging
 
 
 def move_vhds_into_sr(session, instance_uuid, sr_path, uuid_stack):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/workarounds b/plugins/xenserver/xenapi/etc/xapi.d/plugins/workarounds
index 1a11416f11..de567d99af 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/workarounds
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/workarounds
@@ -22,9 +22,10 @@ import shutil
 
 import utils
 
-#FIXME(sirp): should this use pluginlib from 5.6?
-from pluginlib_nova import *
-configure_logging('workarounds')
+import pluginlib_nova
+
+
+pluginlib_nova.configure_logging('workarounds')
 
 
 def _copy_vdis(sr_path, staging_path, vdi_uuids):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
index ea446d6559..b28560107d 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
@@ -37,6 +37,8 @@ import XenAPIPlugin
 
 
 pluginlib.configure_logging("xenhost")
+_ = pluginlib._
+
 
 host_data_pattern = re.compile(r"\s*(\S+) \([^\)]+\) *: ?(.*)")
 config_file_path = "/usr/etc/xenhost.conf"