diff --git a/lib/watcher/__init__.py b/lib/watcher/__init__.py
index 7cc3ce35abe2a9bf1dcdf5590da21d494ce50838..20b3a204bb119b3f348b5ff4e12301d4658cacbb 100644
--- a/lib/watcher/__init__.py
+++ b/lib/watcher/__init__.py
@@ -51,6 +51,7 @@ from ganeti import ssconf
 from ganeti import ht
 
 import ganeti.rapi.client # pylint: disable=W0611
+from ganeti.rapi.client import UsesRapiClient
 
 from ganeti.watcher import nodemaint
 from ganeti.watcher import state
@@ -569,7 +570,7 @@ def _CheckMaster(cl):
     raise NotMasterError("This is not the master node")
 
 
-@rapi.client.UsesRapiClient
+@UsesRapiClient
 def _GlobalWatcher(opts):
   """Main function for global watcher.
 
diff --git a/qa/ganeti-qa.py b/qa/ganeti-qa.py
index 94518128def47432db11da757bc920a71bd789bb..fe4fbbdd5a1744e0aadb66e1802133348c8ac01e 100755
--- a/qa/ganeti-qa.py
+++ b/qa/ganeti-qa.py
@@ -48,6 +48,7 @@ from ganeti import rapi
 from ganeti import constants
 
 import ganeti.rapi.client # pylint: disable=W0611
+from ganeti.rapi.client import UsesRapiClient
 
 
 def _FormatHeader(line, end=72):
@@ -544,7 +545,7 @@ def RunQa():
   RunTestIf("cluster-destroy", qa_cluster.TestClusterDestroy)
 
 
-@rapi.client.UsesRapiClient
+@UsesRapiClient
 def main():
   """Main program.
 
diff --git a/tools/move-instance b/tools/move-instance
index 168ad811fb7789c05cca285bbc612eb9ad38f82d..716b00c4d18127858aaac237bbe756d183268781 100755
--- a/tools/move-instance
+++ b/tools/move-instance
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2010 Google Inc.
+# Copyright (C) 2010, 2011, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@ from ganeti import rapi
 
 import ganeti.rapi.client # pylint: disable=W0611
 import ganeti.rapi.client_utils
+from ganeti.rapi.client import UsesRapiClient
 
 
 SRC_RAPI_PORT_OPT = \
@@ -836,7 +837,7 @@ def CheckOptions(parser, options, args):
   return (src_cluster_name, dest_cluster_name, instance_names)
 
 
-@rapi.client.UsesRapiClient
+@UsesRapiClient
 def main():
   """Main routine.