diff --git a/cloudify_agent/api/utils.py b/cloudify_agent/api/utils.py
index 804bcf33d..f30ddfc1a 100644
--- a/cloudify_agent/api/utils.py
+++ b/cloudify_agent/api/utils.py
@@ -28,12 +28,12 @@
 from jinja2 import Template
 from urllib.parse import quote as urlquote
 
-from cloudify.cluster import CloudifyClusterClient
 from cloudify.workflows import tasks as workflows_tasks
 from cloudify.utils import setup_logger, get_exec_tempdir, ipv6_url_compat
 from cloudify.constants import (SECURED_PROTOCOL,
                                 BROKER_PORT_SSL,
                                 BROKER_PORT_NO_SSL)
+from cloudify_rest_client.client import CloudifyClient
 # imported here for backwards compat
 from cloudify.amqp_client import is_agent_alive  # noqa
 
@@ -448,7 +448,7 @@ def get_rest_client(rest_host,
                       'create a REST client for a secured ' \
                       'manager [{1}]'.format(name, rest_host)
 
-    return CloudifyClusterClient(
+    return CloudifyClient(
         host=rest_host,
         protocol=SECURED_PROTOCOL,
         port=rest_port,
diff --git a/dev-requirements.txt b/dev-requirements.txt
index a83a35ccf..a5a5e1503 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1 +1 @@
-https://github.com/cloudify-cosmo/cloudify-common/archive/master.zip
+https://github.com/cloudify-cosmo/cloudify-common/archive/restclient-asyncclient-1.zip