diff --git a/contrib/devstack/lib/mistral b/contrib/devstack/lib/mistral
index a079fdf2..4401d47f 100644
--- a/contrib/devstack/lib/mistral
+++ b/contrib/devstack/lib/mistral
@@ -24,6 +24,10 @@ set -o xtrace
 MISTRAL_REPO=${MISTRAL_REPO:-${GIT_BASE}/stackforge/mistral.git}
 MISTRAL_BRANCH=${MISTRAL_BRANCH:-master}
 
+MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/stackforge/python-mistralclient.git}
+MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-$MISTRAL_BRANCH}
+MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
+
 # Set up default directories
 MISTRAL_DIR=$DEST/mistral
 MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral}
@@ -137,6 +141,8 @@ function init_mistral() {
 
 # install_mistral() - Collect source and prepare
 function install_mistral() {
+    install_mistral_pythonclient
+
     git_clone $MISTRAL_REPO $MISTRAL_DIR $MISTRAL_BRANCH
 
     # setup_package function is used because Mistral requirements
@@ -146,6 +152,11 @@ function install_mistral() {
     setup_package $MISTRAL_DIR -e
 }
 
+function install_mistral_pythonclient() {
+    git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH
+    setup_package $MISTRAL_PYTHONCLIENT_DIR -e
+}
+
 
 # start_mistral() - Start running processes, including screen
 function start_mistral() {
diff --git a/functionaltests/pre_test_hook.sh b/functionaltests/pre_test_hook.sh
index 2e1c1e18..08c8b082 100755
--- a/functionaltests/pre_test_hook.sh
+++ b/functionaltests/pre_test_hook.sh
@@ -14,7 +14,7 @@
 
 # This script is executed inside pre_test_hook function in desvstack gate.
 
-# Install Murano devstack integration
+# Install Mistral devstack integration
 MISTRAL_BASE=/opt/stack/new/mistral/contrib/devstack
 DEVSTACK_BASE=/opt/stack/new/devstack
 cp $MISTRAL_BASE/lib/* $DEVSTACK_BASE/lib