Remove unused imports

This patch removes unused imports, alse pylint has been configured to
check unused imports.

Reviewed-By: Jan Cholasta <jcholast@redhat.com>

43 files changed, 38 insertions, 96 deletions

diff --git a/ipatests/i18n.py b/ipatests/i18n.py
index 813b78982..a83c5806e 100755
--- a/ipatests/i18n.py
+++ b/ipatests/i18n.py
@@ -26,7 +26,6 @@ from __future__ import print_function
 import optparse
 import sys
 import gettext
-import locale
 import re
 import os
 import traceback
diff --git a/ipatests/setup.py.in b/ipatests/setup.py.in
index ce1efb761..cb5f72255 100644
--- a/ipatests/setup.py.in
+++ b/ipatests/setup.py.in
@@ -25,7 +25,6 @@ DOCLINES = __doc__.split("\n")
 
 import os
 import sys
-import distutils.sysconfig
 
 CLASSIFIERS = """\
 Development Status :: 4 - Beta
diff --git a/ipatests/test_cmdline/test_cli.py b/ipatests/test_cmdline/test_cli.py
index ddc4c71a8..aeade0eda 100644
--- a/ipatests/test_cmdline/test_cli.py
+++ b/ipatests/test_cmdline/test_cli.py
@@ -8,7 +8,6 @@ from six import StringIO
 
 from ipatests import util
 from ipalib import api, errors
-from ipapython.version import API_VERSION
 import pytest
 
 if six.PY3:
diff --git a/ipatests/test_cmdline/test_help.py b/ipatests/test_cmdline/test_help.py
index fee942007..40b99c19c 100644
--- a/ipatests/test_cmdline/test_help.py
+++ b/ipatests/test_cmdline/test_help.py
@@ -18,9 +18,7 @@
 #
 
 import sys
-import contextlib
 
-from nose.tools import assert_raises  # pylint: disable=E0611
 import six
 from six import StringIO
 
diff --git a/ipatests/test_cmdline/test_ipagetkeytab.py b/ipatests/test_cmdline/test_ipagetkeytab.py
index 37f4e4a7a..e712279bb 100644
--- a/ipatests/test_cmdline/test_ipagetkeytab.py
+++ b/ipatests/test_cmdline/test_ipagetkeytab.py
@@ -27,11 +27,9 @@ from ipalib import api
 from ipalib import errors
 import tempfile
 from ipapython import ipautil, ipaldap
-import nose
 import tempfile
 import gssapi
 from ipaserver.plugins.ldap2 import ldap2
-from ipapython.dn import DN
 import pytest
 
 def use_keytab(principal, keytab):
diff --git a/ipatests/test_integration/test_installation.py b/ipatests/test_integration/test_installation.py
index 925cc7d83..c3d194fb4 100644
--- a/ipatests/test_integration/test_installation.py
+++ b/ipatests/test_integration/test_installation.py
@@ -7,8 +7,6 @@ Module provides tests which testing ability of various subsystems to be
 installed.
 """
 
-import time
-
 from ipatests.test_integration.base import IntegrationTest
 from ipatests.test_integration import tasks
 
diff --git a/ipatests/test_ipalib/test_backend.py b/ipatests/test_ipalib/test_backend.py
index f758d4ac7..6fb2d8558 100644
--- a/ipatests/test_ipalib/test_backend.py
+++ b/ipatests/test_ipalib/test_backend.py
@@ -31,7 +31,7 @@ from ipatests.util import ClassChecker, raises, create_test_api
 from ipatests.data import unicode_str
 from ipalib.request import context, Connection
 from ipalib.frontend import Command
-from ipalib import  backend, plugable, errors, base
+from ipalib import  backend, plugable, errors
 from ipapython.version import API_VERSION
 
 import pytest
diff --git a/ipatests/test_ipalib/test_cli.py b/ipatests/test_ipalib/test_cli.py
index 3004e1f76..f03e155a7 100644
--- a/ipatests/test_ipalib/test_cli.py
+++ b/ipatests/test_ipalib/test_cli.py
@@ -21,8 +21,8 @@
 Test the `ipalib.cli` module.
 """
 
-from ipatests.util import raises, get_api, ClassChecker
-from ipalib import cli, plugable, frontend, backend
+from ipatests.util import raises, ClassChecker
+from ipalib import cli, plugable
 
 import pytest
 
diff --git a/ipatests/test_ipalib/test_config.py b/ipatests/test_ipalib/test_config.py
index 09885a578..22851559a 100644
--- a/ipatests/test_ipalib/test_config.py
+++ b/ipatests/test_ipalib/test_config.py
@@ -22,14 +22,12 @@
 Test the `ipalib.config` module.
 """
 
-import os
 from os import path
 import sys
-import socket
-from ipatests.util import raises, setitem, delitem, ClassChecker
-from ipatests.util import getitem, setitem, delitem
+from ipatests.util import raises, delitem, ClassChecker
+from ipatests.util import getitem
 from ipatests.util import TempDir, TempHome
-from ipalib.constants import TYPE_ERROR, OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
+from ipalib.constants import OVERRIDE_ERROR, SET_ERROR, DEL_ERROR
 from ipalib.constants import NAME_REGEX, NAME_ERROR
 from ipalib import config, constants, base
 from ipaplatform.paths import paths
diff --git a/ipatests/test_ipalib/test_crud.py b/ipatests/test_ipalib/test_crud.py
index c4b69c556..125b82465 100644
--- a/ipatests/test_ipalib/test_crud.py
+++ b/ipatests/test_ipalib/test_crud.py
@@ -21,8 +21,8 @@
 Test the `ipalib.crud` module.
 """
 
-from ipatests.util import read_only, raises, get_api, ClassChecker
-from ipalib import crud, frontend, plugable, config
+from ipatests.util import raises, get_api, ClassChecker
+from ipalib import crud, frontend
 from ipalib.parameters import Str
 
 import pytest
diff --git a/ipatests/test_ipalib/test_errors.py b/ipatests/test_ipalib/test_errors.py
index 4dc84501b..7ad07b041 100644
--- a/ipatests/test_ipalib/test_errors.py
+++ b/ipatests/test_ipalib/test_errors.py
@@ -31,7 +31,7 @@ import pytest
 import six
 
 from ipatests.util import assert_equal, raises
-from ipalib import errors, text
+from ipalib import errors
 from ipaplatform.paths import paths
 from ipalib.constants import TYPE_ERROR
 
diff --git a/ipatests/test_ipalib/test_output.py b/ipatests/test_ipalib/test_output.py
index 927da74f3..5741637f9 100644
--- a/ipatests/test_ipalib/test_output.py
+++ b/ipatests/test_ipalib/test_output.py
@@ -24,7 +24,6 @@ Test the `ipalib.output` module.
 from ipatests.util import raises, ClassChecker
 from ipalib import output
 from ipalib.frontend import Command
-from ipalib import _
 from ipapython.version import API_VERSION
 
 import pytest
diff --git a/ipatests/test_ipalib/test_plugable.py b/ipatests/test_ipalib/test_plugable.py
index 3e7e64bc8..0434d7970 100644
--- a/ipatests/test_ipalib/test_plugable.py
+++ b/ipatests/test_ipalib/test_plugable.py
@@ -24,12 +24,9 @@ Test the `ipalib.plugable` module.
 # FIXME: Pylint errors
 # pylint: disable=no-member
 
-import inspect
-from ipatests.util import raises, no_set, no_del, read_only
-from ipatests.util import getitem, setitem, delitem
+from ipatests.util import raises, read_only
 from ipatests.util import ClassChecker, create_test_api
 from ipalib import plugable, errors, text
-from ipaplatform.paths import paths
 
 import pytest
 
diff --git a/ipatests/test_ipalib/test_text.py b/ipatests/test_ipalib/test_text.py
index acf0bc22c..bdc762335 100644
--- a/ipatests/test_ipalib/test_text.py
+++ b/ipatests/test_ipalib/test_text.py
@@ -25,17 +25,13 @@ from __future__ import print_function
 import os
 import shutil
 import tempfile
-import re
 
 import nose
-import locale
 import six
 import pytest
 
-from ipatests.util import raises, assert_equal
 from ipatests.i18n import create_po, po_file_iterate
 from ipalib.request import context
-from ipalib import request
 from ipalib import text
 from ipapython.ipautil import file_exists
 
diff --git a/ipatests/test_ipapython/test_cookie.py b/ipatests/test_ipapython/test_cookie.py
index 5b71b0745..97cb79a07 100644
--- a/ipatests/test_ipapython/test_cookie.py
+++ b/ipatests/test_ipapython/test_cookie.py
@@ -18,7 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import unittest
-import time
 import datetime
 import email.utils
 import calendar
diff --git a/ipatests/test_ipapython/test_ipautil.py b/ipatests/test_ipapython/test_ipautil.py
index f91b730c5..1197d5ce5 100644
--- a/ipatests/test_ipapython/test_ipautil.py
+++ b/ipatests/test_ipapython/test_ipautil.py
@@ -22,8 +22,6 @@
 Test the `ipapython/ipautil.py` module.
 """
 
-import sys
-
 import nose
 import pytest
 import six
diff --git a/ipatests/test_ipapython/test_keyring.py b/ipatests/test_ipapython/test_keyring.py
index 02fd29e8c..e22841c8f 100644
--- a/ipatests/test_ipapython/test_keyring.py
+++ b/ipatests/test_ipapython/test_keyring.py
@@ -20,7 +20,7 @@
 Test the `kernel_keyring.py` module.
 """
 
-from nose.tools import raises, assert_raises  # pylint: disable=E0611
+from nose.tools import raises  # pylint: disable=E0611
 from ipapython import kernel_keyring
 
 import pytest
diff --git a/ipatests/test_ipapython/test_ssh.py b/ipatests/test_ipapython/test_ssh.py
index 509d1a085..817ef057e 100644
--- a/ipatests/test_ipapython/test_ssh.py
+++ b/ipatests/test_ipapython/test_ssh.py
@@ -23,7 +23,6 @@ Test the `ipapython/ssh.py` module.
 import base64
 
 import six
-import nose
 import pytest
 
 from ipapython import ssh
diff --git a/ipatests/test_ipaserver/test_changepw.py b/ipatests/test_ipaserver/test_changepw.py
index 866ea5554..9c74f2ef3 100644
--- a/ipatests/test_ipaserver/test_changepw.py
+++ b/ipatests/test_ipaserver/test_changepw.py
@@ -23,7 +23,7 @@ import pytest
 
 from ipatests.test_ipaserver.httptest import Unauthorized_HTTP_test
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
-from ipatests.util import assert_equal, assert_not_equal
+from ipatests.util import assert_equal
 from ipalib import api, errors
 from ipapython.dn import DN
 
diff --git a/ipatests/test_ipaserver/test_otptoken_import.py b/ipatests/test_ipaserver/test_otptoken_import.py
index 3325b0c5a..0969e02d5 100644
--- a/ipatests/test_ipaserver/test_otptoken_import.py
+++ b/ipatests/test_ipaserver/test_otptoken_import.py
@@ -18,8 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import sys
-import nose
 import pytest
 from nss import nss
 from ipalib.x509 import initialize_nss_database
diff --git a/ipatests/test_ipaserver/test_rpcserver.py b/ipatests/test_ipaserver/test_rpcserver.py
index 976ebf7d6..03a4cebb2 100644
--- a/ipatests/test_ipaserver/test_rpcserver.py
+++ b/ipatests/test_ipaserver/test_rpcserver.py
@@ -26,9 +26,8 @@ import pytest
 
 import six
 
-from ipatests.util import create_test_api, assert_equal, raises, PluginTester
-from ipatests.data import unicode_str
-from ipalib import errors, Command
+from ipatests.util import assert_equal, raises, PluginTester
+from ipalib import errors
 from ipaserver import rpcserver
 
 if six.PY3:
diff --git a/ipatests/test_webui/test_hostgroup.py b/ipatests/test_webui/test_hostgroup.py
index 1879bad8c..9b10de276 100644
--- a/ipatests/test_webui/test_hostgroup.py
+++ b/ipatests/test_webui/test_hostgroup.py
@@ -27,7 +27,6 @@ import ipatests.test_webui.data_hostgroup as hostgroup
 from ipatests.test_webui.test_host import host_tasks, ENTITY as HOST_ENTITY
 import ipatests.test_webui.data_netgroup as netgroup
 import ipatests.test_webui.data_hbac as hbac
-import ipatests.test_webui.test_rbac as rbac
 import ipatests.test_webui.data_sudo as sudo
 import pytest
 
diff --git a/ipatests/test_xmlrpc/test_automount_plugin.py b/ipatests/test_xmlrpc/test_automount_plugin.py
index 073dfcf14..929205692 100644
--- a/ipatests/test_xmlrpc/test_automount_plugin.py
+++ b/ipatests/test_xmlrpc/test_automount_plugin.py
@@ -21,7 +21,6 @@
 Test the `ipalib/plugins/automount.py' module.
 """
 
-import sys
 import textwrap
 import tempfile
 import shutil
@@ -34,7 +33,6 @@ import six
 
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
-from ipaplatform.paths import paths
 from ipatests.util import assert_deepequal
 
 if six.PY3:
diff --git a/ipatests/test_xmlrpc/test_batch_plugin.py b/ipatests/test_xmlrpc/test_batch_plugin.py
index ca042d347..92b4af54a 100644
--- a/ipatests/test_xmlrpc/test_batch_plugin.py
+++ b/ipatests/test_xmlrpc/test_batch_plugin.py
@@ -21,9 +21,9 @@
 Test the `ipalib/plugins/batch.py` module.
 """
 
-from ipalib import api, errors
+from ipalib import api
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.util import assert_equal, Fuzzy, assert_deepequal
+from ipatests.util import Fuzzy, assert_deepequal
 from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
                                               fuzzy_uuid)
 from ipapython.dn import DN
diff --git a/ipatests/test_xmlrpc/test_caacl_plugin.py b/ipatests/test_xmlrpc/test_caacl_plugin.py
index d5ded1951..85c7072a0 100644
--- a/ipatests/test_xmlrpc/test_caacl_plugin.py
+++ b/ipatests/test_xmlrpc/test_caacl_plugin.py
@@ -12,7 +12,6 @@ from ipalib import errors
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 
 # reuse the fixture
-from ipatests.test_xmlrpc.test_certprofile_plugin import default_profile
 from ipatests.test_xmlrpc.tracker.caacl_plugin import CAACLTracker
 from ipatests.test_xmlrpc.tracker.stageuser_plugin import StageUserTracker
 
diff --git a/ipatests/test_xmlrpc/test_cert_plugin.py b/ipatests/test_xmlrpc/test_cert_plugin.py
index f54a226e4..ba8dd4636 100644
--- a/ipatests/test_xmlrpc/test_cert_plugin.py
+++ b/ipatests/test_xmlrpc/test_cert_plugin.py
@@ -20,12 +20,11 @@
 Test the `ipalib/plugins/cert.py` module against a RA.
 """
 
-import sys
 import os
 import shutil
 from nose.tools import raises, assert_raises  # pylint: disable=E0611
 
-from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 from ipalib import x509
diff --git a/ipatests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py
index 291b86a7e..2a9086f25 100644
--- a/ipatests/test_xmlrpc/test_config_plugin.py
+++ b/ipatests/test_xmlrpc/test_config_plugin.py
@@ -22,8 +22,7 @@ Test the `ipalib/plugins/config.py` module.
 """
 
 from ipalib import errors
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 import pytest
 
 
diff --git a/ipatests/test_xmlrpc/test_delegation_plugin.py b/ipatests/test_xmlrpc/test_delegation_plugin.py
index 119822983..99a0bcdcb 100644
--- a/ipatests/test_xmlrpc/test_delegation_plugin.py
+++ b/ipatests/test_xmlrpc/test_delegation_plugin.py
@@ -22,9 +22,7 @@ Test the `ipalib/plugins/delegation.py` module.
 """
 
 from ipalib import api, errors
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.dn import DN
 import pytest
 
diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index 1ec10bf06..200c57d49 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -26,8 +26,7 @@ from ipalib.util import normalize_zone
 from ipapython.dnsutil import DNSName
 from ipapython.dn import DN
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_digits
 import pytest
 
 try:
diff --git a/ipatests/test_xmlrpc/test_group_plugin.py b/ipatests/test_xmlrpc/test_group_plugin.py
index f2bd0f4b9..6eb57c12f 100644
--- a/ipatests/test_xmlrpc/test_group_plugin.py
+++ b/ipatests/test_xmlrpc/test_group_plugin.py
@@ -21,19 +21,20 @@
 Test the `ipalib/plugins/group.py` module.
 """
 
-import functools
 import pytest
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits, fuzzy_uuid, fuzzy_set_ci,
-                         add_sid, add_oc, XMLRPC_test, raises_exact)
+from ipatests.test_xmlrpc.xmlrpc_test import (
+    Declarative,
+    fuzzy_digits,
+    fuzzy_uuid,
+    fuzzy_set_ci,
+    add_sid,
+    add_oc)
 from ipapython.dn import DN
 from ipatests.test_xmlrpc.test_user_plugin import get_user_result
 
-from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker
-from ipatests.util import assert_deepequal
-
 
 group1 = u'testgroup1'
 group2 = u'testgroup2'
diff --git a/ipatests/test_xmlrpc/test_hbactest_plugin.py b/ipatests/test_xmlrpc/test_hbactest_plugin.py
index 9b631a4b5..fba3bec8e 100644
--- a/ipatests/test_xmlrpc/test_hbactest_plugin.py
+++ b/ipatests/test_xmlrpc/test_hbactest_plugin.py
@@ -21,7 +21,7 @@
 Test the `ipalib/plugins/hbactest.py` module.
 """
 
-from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test
 from ipalib import api
 from ipalib import errors
 from nose.tools import raises
diff --git a/ipatests/test_xmlrpc/test_netgroup_plugin.py b/ipatests/test_xmlrpc/test_netgroup_plugin.py
index 611bdf2ff..c03566b12 100644
--- a/ipatests/test_xmlrpc/test_netgroup_plugin.py
+++ b/ipatests/test_xmlrpc/test_netgroup_plugin.py
@@ -21,11 +21,8 @@
 Test the `ipalib/plugins/netgroup.py` module.
 """
 
-import nose
-
 from ipalib import api
 from ipalib import errors
-from ipaserver.plugins.ldap2 import ldap2
 from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
                                               fuzzy_uuid, fuzzy_netgroupdn)
 from ipatests.test_xmlrpc import objectclasses
diff --git a/ipatests/test_xmlrpc/test_old_permission_plugin.py b/ipatests/test_xmlrpc/test_old_permission_plugin.py
index c7c300446..9e4b561a6 100644
--- a/ipatests/test_xmlrpc/test_old_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_old_permission_plugin.py
@@ -27,8 +27,7 @@ http://www.freeipa.org/page/V3/Permissions_V2
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.dn import DN
 import pytest
 
diff --git a/ipatests/test_xmlrpc/test_passwd_plugin.py b/ipatests/test_xmlrpc/test_passwd_plugin.py
index 2945d7040..0ebe14c26 100644
--- a/ipatests/test_xmlrpc/test_passwd_plugin.py
+++ b/ipatests/test_xmlrpc/test_passwd_plugin.py
@@ -20,8 +20,6 @@
 Test the `ipalib/plugins/passwd.py` module.
 """
 
-import sys
-
 from nose.tools import assert_raises  # pylint: disable=E0611
 
 from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, assert_attr_equal
diff --git a/ipatests/test_xmlrpc/test_ping_plugin.py b/ipatests/test_xmlrpc/test_ping_plugin.py
index e1c772ad6..afd34fa14 100644
--- a/ipatests/test_xmlrpc/test_ping_plugin.py
+++ b/ipatests/test_xmlrpc/test_ping_plugin.py
@@ -21,10 +21,9 @@
 Test the `ipalib/plugins/ping.py` module, and XML-RPC in general.
 """
 
-from ipalib import api, errors, messages, _
+from ipalib import errors, _
 from ipatests.util import Fuzzy
 from ipatests.test_xmlrpc.xmlrpc_test import Declarative
-from ipapython.version import API_VERSION
 import pytest
 
 
diff --git a/ipatests/test_xmlrpc/test_privilege_plugin.py b/ipatests/test_xmlrpc/test_privilege_plugin.py
index 148f7d1fe..ce9afe2fd 100644
--- a/ipatests/test_xmlrpc/test_privilege_plugin.py
+++ b/ipatests/test_xmlrpc/test_privilege_plugin.py
@@ -23,8 +23,7 @@ Test the `ipalib/plugins/privilege.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 from ipapython.dn import DN
 import pytest
 
diff --git a/ipatests/test_xmlrpc/test_role_plugin.py b/ipatests/test_xmlrpc/test_role_plugin.py
index 70b5f6165..d06daac69 100644
--- a/ipatests/test_xmlrpc/test_role_plugin.py
+++ b/ipatests/test_xmlrpc/test_role_plugin.py
@@ -24,8 +24,7 @@ Test the `ipalib/plugins/role.py` module.
 
 from ipalib import api, errors
 from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_uuid
 from ipapython.dn import DN
 import pytest
 
diff --git a/ipatests/test_xmlrpc/test_selfservice_plugin.py b/ipatests/test_xmlrpc/test_selfservice_plugin.py
index eed1a2d7e..9dd3916de 100644
--- a/ipatests/test_xmlrpc/test_selfservice_plugin.py
+++ b/ipatests/test_xmlrpc/test_selfservice_plugin.py
@@ -21,10 +21,8 @@
 Test the `ipalib/plugins/selfservice.py` module.
 """
 
-from ipalib import api, errors
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (Declarative, fuzzy_digits,
-                                              fuzzy_uuid)
+from ipalib import errors
+from ipatests.test_xmlrpc.xmlrpc_test import Declarative
 import pytest
 
 selfservice1 = u'testself'
diff --git a/ipatests/test_xmlrpc/test_service_plugin.py b/ipatests/test_xmlrpc/test_service_plugin.py
index ecc5248a9..9bd082916 100644
--- a/ipatests/test_xmlrpc/test_service_plugin.py
+++ b/ipatests/test_xmlrpc/test_service_plugin.py
@@ -27,8 +27,7 @@ from ipatests.test_xmlrpc.xmlrpc_test import fuzzy_digits, fuzzy_date, fuzzy_iss
 from ipatests.test_xmlrpc.xmlrpc_test import fuzzy_hex
 from ipatests.test_xmlrpc import objectclasses
 from ipatests.test_xmlrpc.testcert import get_testcert
-from ipatests.test_xmlrpc.test_user_plugin import (
-    get_user_result, get_user_dn, get_group_dn)
+from ipatests.test_xmlrpc.test_user_plugin import get_user_result, get_group_dn
 import base64
 from ipapython.dn import DN
 import pytest
diff --git a/ipatests/test_xmlrpc/test_stageuser_plugin.py b/ipatests/test_xmlrpc/test_stageuser_plugin.py
index 42ecf0468..b6744eb8e 100644
--- a/ipatests/test_xmlrpc/test_stageuser_plugin.py
+++ b/ipatests/test_xmlrpc/test_stageuser_plugin.py
@@ -6,11 +6,6 @@
 Test the `ipalib/plugins/stageuser.py` module.
 """
 
-
-import datetime
-import ldap
-import re
-import functools
 import pytest
 
 import six
@@ -18,14 +13,8 @@ import six
 from collections import OrderedDict
 from ipalib import api, errors
 
-from ipatests.test_xmlrpc import objectclasses
-from ipatests.test_xmlrpc.xmlrpc_test import (
-    XMLRPC_test, fuzzy_digits, fuzzy_uuid, fuzzy_password, fuzzy_string,
-    fuzzy_dergeneralizedtime, add_sid, add_oc, raises_exact)
+from ipatests.test_xmlrpc.xmlrpc_test import XMLRPC_test, raises_exact
 
-from ipatests.util import (
-    assert_equal, assert_deepequal, assert_not_equal, raises, get_user_dn)
-from ipapython.dn import DN
 from ipatests.test_xmlrpc.tracker.user_plugin import UserTracker
 from ipatests.test_xmlrpc.tracker.group_plugin import GroupTracker
 from ipatests.test_xmlrpc.tracker.stageuser_plugin import StageUserTracker
diff --git a/ipatests/test_xmlrpc/test_vault_plugin.py b/ipatests/test_xmlrpc/test_vault_plugin.py
index 5a0acb170..c8d778583 100644
--- a/ipatests/test_xmlrpc/test_vault_plugin.py
+++ b/ipatests/test_xmlrpc/test_vault_plugin.py
@@ -22,7 +22,7 @@ Test the `ipalib/plugins/vault.py` module.
 """
 
 import nose
-from ipalib import api, errors
+from ipalib import api
 from ipatests.test_xmlrpc.xmlrpc_test import Declarative, fuzzy_string
 import pytest
 
diff --git a/ipatests/test_xmlrpc/testcert.py b/ipatests/test_xmlrpc/testcert.py
index 620879205..b7abcdcec 100644
--- a/ipatests/test_xmlrpc/testcert.py
+++ b/ipatests/test_xmlrpc/testcert.py
@@ -34,7 +34,6 @@ from ipalib import api, x509
 from ipaserver.plugins import rabase
 from ipapython import ipautil
 from ipaplatform.paths import paths
-from ipapython.dn import DN
 
 if six.PY3:
     unicode = str
diff --git a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py
index 0f7eadd04..72edd3342 100644
--- a/ipatests/test_xmlrpc/tracker/stageuser_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/stageuser_plugin.py
@@ -11,7 +11,7 @@ from ipatests.test_xmlrpc import objectclasses
 from ipatests.test_xmlrpc.xmlrpc_test import (
     fuzzy_string, fuzzy_dergeneralizedtime, raises_exact)
 
-from ipatests.util import assert_deepequal, get_user_dn
+from ipatests.util import assert_deepequal
 from ipapython.dn import DN
 
 if six.PY3: