diff --git a/tempest/clients.py b/tempest/clients.py
index 4842d30..03cffcb 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -162,7 +162,12 @@
         self._set_volume_clients()
         self._set_object_storage_clients()
 
-        self.baremetal_client = BaremetalClientJSON(self.auth_provider)
+        self.baremetal_client = BaremetalClientJSON(
+            self.auth_provider,
+            CONF.baremetal.catalog_type,
+            CONF.identity.region,
+            endpoint_type=CONF.baremetal.endpoint_type,
+            **self.default_params_with_timeout_values)
         self.network_client = NetworkClientJSON(
             self.auth_provider,
             CONF.network.catalog_type,
diff --git a/tempest/services/baremetal/base.py b/tempest/services/baremetal/base.py
index 4f67bf5..4c6a5bf 100644
--- a/tempest/services/baremetal/base.py
+++ b/tempest/services/baremetal/base.py
@@ -17,9 +17,6 @@
 import six
 
 from tempest.common import service_client
-from tempest import config
-
-CONF = config.CONF
 
 
 def handle_errors(f):
@@ -48,13 +45,7 @@
 
     """
 
-    def __init__(self, auth_provider):
-        super(BaremetalClient, self).__init__(
-            auth_provider,
-            CONF.baremetal.catalog_type,
-            CONF.identity.region,
-            endpoint_type=CONF.baremetal.endpoint_type)
-        self.uri_prefix = ''
+    uri_prefix = ''
 
     def serialize(self, object_dict):
         """Serialize an Ironic object."""
diff --git a/tempest/services/baremetal/v1/json/baremetal_client.py b/tempest/services/baremetal/v1/json/baremetal_client.py
index c20e793..1c72a2b 100644
--- a/tempest/services/baremetal/v1/json/baremetal_client.py
+++ b/tempest/services/baremetal/v1/json/baremetal_client.py
@@ -17,10 +17,8 @@
     """
     Base Tempest REST client for Ironic API v1.
     """
-    def __init__(self, auth_provider):
-        super(BaremetalClientJSON, self).__init__(auth_provider)
-        self.version = '1'
-        self.uri_prefix = 'v%s' % self.version
+    version = '1'
+    uri_prefix = 'v1'
 
     @base.handle_errors
     def list_nodes(self, **kwargs):
diff --git a/tempest/tests/common/test_service_clients.py b/tempest/tests/common/test_service_clients.py
index d368e87..8a2782d 100644
--- a/tempest/tests/common/test_service_clients.py
+++ b/tempest/tests/common/test_service_clients.py
@@ -16,6 +16,7 @@
 import random
 import six
 
+from tempest.services.baremetal.v1.json import baremetal_client
 from tempest.services.compute.json import agents_client
 from tempest.services.compute.json import aggregates_client
 from tempest.services.compute.json import availability_zone_client
@@ -58,6 +59,7 @@
     @mock.patch('tempest_lib.common.rest_client.RestClient.__init__')
     def test_service_client_creations_with_specified_args(self, mock_init):
         test_clients = [
+            baremetal_client.BaremetalClientJSON,
             agents_client.AgentsClientJSON,
             aggregates_client.AggregatesClientJSON,
             availability_zone_client.AvailabilityZoneClientJSON,