diff --git a/ironic_tempest_plugin/services/baremetal/base.py b/ironic_tempest_plugin/services/baremetal/base.py
index 757a770..494c780 100644
--- a/ironic_tempest_plugin/services/baremetal/base.py
+++ b/ironic_tempest_plugin/services/baremetal/base.py
@@ -10,9 +10,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import functools
 
 from oslo_serialization import jsonutils as json
+import six
 from six.moves import http_client
 from six.moves.urllib import parse as urllib
 from tempest.lib.common import api_version_utils
@@ -36,7 +36,7 @@
 def handle_errors(f):
     """A decorator that allows to ignore certain types of errors."""
 
-    @functools.wraps(f)
+    @six.wraps(f)
     def wrapper(*args, **kwargs):
         param_name = 'ignore_errors'
         ignored_errors = kwargs.get(param_name, tuple())
diff --git a/ironic_tempest_plugin/tests/api/admin/base.py b/ironic_tempest_plugin/tests/api/admin/base.py
index 2e7a4ff..6bedae4 100644
--- a/ironic_tempest_plugin/tests/api/admin/base.py
+++ b/ironic_tempest_plugin/tests/api/admin/base.py
@@ -10,8 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import functools
-
+import six
 from tempest import config
 from tempest.lib.common import api_version_utils
 from tempest.lib.common.utils import data_utils
@@ -41,7 +40,7 @@
     """Decorator that adds resources to the appropriate cleanup list."""
 
     def decorator(f):
-        @functools.wraps(f)
+        @six.wraps(f)
         def wrapper(cls, *args, **kwargs):
             resp, body = f(cls, *args, **kwargs)