diff --git a/tools/deployment/common/setup-client.sh b/tools/deployment/common/setup-client.sh
index 64c9b6ef..9203fe92 100755
--- a/tools/deployment/common/setup-client.sh
+++ b/tools/deployment/common/setup-client.sh
@@ -13,10 +13,9 @@
 
 set -xe
 
-sudo -H -E pip install "cmd2<=0.8.7"
-sudo -H -E pip install \
--c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master} \
-python-openstackclient python-heatclient --ignore-installed
+sudo -H -E pip3 install \
+  -c${UPPER_CONSTRAINTS_FILE:=https://releases.openstack.org/constraints/upper/master} \
+  cmd2 python-openstackclient python-heatclient --ignore-installed
 
 sudo -H mkdir -p /etc/openstack
 sudo -H chown -R $(id -un): /etc/openstack