diff --git a/tempest/clients.py b/tempest/clients.py
index f484d70..8d8dd02 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -187,7 +187,11 @@
             **self.default_params_with_timeout_values)
         if CONF.service_available.ceilometer:
             self.telemetry_client = TelemetryClientJSON(
-                self.auth_provider)
+                self.auth_provider,
+                CONF.telemetry.catalog_type,
+                CONF.identity.region,
+                endpoint_type=CONF.telemetry.endpoint_type,
+                **self.default_params_with_timeout_values)
         self.negative_client = negative_rest_client.NegativeRestClient(
             self.auth_provider, service)
 
diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index 6c72ca9..9fb982c 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -150,6 +150,12 @@
             'ca_certs': CONF.identity.ca_certificates_file,
             'trace_requests': CONF.debug.trace_requests
         }
+        default_params_with_timeout_values = {
+            'build_interval': CONF.compute.build_interval,
+            'build_timeout': CONF.compute.build_timeout
+        }
+        default_params_with_timeout_values.update(default_params)
+
         compute_params = {
             'service': CONF.compute.catalog_type,
             'region': CONF.compute.region or CONF.identity.region,
@@ -183,7 +189,12 @@
         self.containers = container_client.ContainerClient(
             _auth, **object_storage_params)
         self.images = image_client.ImageClientV2JSON(_auth)
-        self.telemetry = telemetry_client.TelemetryClientJSON(_auth)
+        self.telemetry = telemetry_client.TelemetryClientJSON(
+            _auth,
+            CONF.telemetry.catalog_type,
+            CONF.identity.region,
+            endpoint_type=CONF.telemetry.endpoint_type,
+            **default_params_with_timeout_values)
         self.volumes = volumes_client.VolumesClientJSON(_auth)
         self.networks = network_client.NetworkClientJSON(
             _auth,
diff --git a/tempest/services/telemetry/json/telemetry_client.py b/tempest/services/telemetry/json/telemetry_client.py
index 2bbd88d..2967cfa 100644
--- a/tempest/services/telemetry/json/telemetry_client.py
+++ b/tempest/services/telemetry/json/telemetry_client.py
@@ -16,22 +16,13 @@
 import urllib
 
 from tempest.common import service_client
-from tempest import config
 from tempest.openstack.common import jsonutils as json
 
-CONF = config.CONF
-
 
 class TelemetryClientJSON(service_client.ServiceClient):
 
-    def __init__(self, auth_provider):
-        super(TelemetryClientJSON, self).__init__(
-            auth_provider,
-            CONF.telemetry.catalog_type,
-            CONF.identity.region,
-            endpoint_type=CONF.telemetry.endpoint_type)
-        self.version = '2'
-        self.uri_prefix = "v%s" % self.version
+    version = '2'
+    uri_prefix = "v2"
 
     def deserialize(self, body):
         return json.loads(body.replace("\n", ""))
diff --git a/tempest/tests/common/test_service_clients.py b/tempest/tests/common/test_service_clients.py
index d8a5ec5..d368e87 100644
--- a/tempest/tests/common/test_service_clients.py
+++ b/tempest/tests/common/test_service_clients.py
@@ -49,6 +49,7 @@
 from tempest.services.object_storage import container_client
 from tempest.services.object_storage import object_client
 from tempest.services.orchestration.json import orchestration_client
+from tempest.services.telemetry.json import telemetry_client
 from tempest.tests import base
 
 
@@ -89,7 +90,8 @@
             account_client.AccountClient,
             container_client.ContainerClient,
             object_client.ObjectClient,
-            orchestration_client.OrchestrationClient]
+            orchestration_client.OrchestrationClient,
+            telemetry_client.TelemetryClientJSON]
 
         for client in test_clients:
             fake_string = six.text_type(random.randint(1, 0x7fffffff))