diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index c4f584a943..1caab93834 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -26,6 +26,8 @@ export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible==2.4.6.0"}
 export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"}
 export SSH_DIR=${SSH_DIR:-"/root/.ssh"}
 export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-"noninteractive"}
+# check whether to install the ARA callback plugin
+export SETUP_ARA=${SETUP_ARA:-"false"}
 
 # Set the role fetch mode to any option [galaxy, git-clone]
 export ANSIBLE_ROLE_FETCH_MODE=${ANSIBLE_ROLE_FETCH_MODE:-git-clone}
@@ -288,6 +290,11 @@ chmod +x /usr/local/bin/openstack-ansible
 
 echo "openstack-ansible wrapper created."
 
+# Install and export the ARA callback plugin
+if [ "${SETUP_ARA}" == "true" ]; then
+  setup_ara
+fi
+
 # If the Ansible plugins are in the old location remove them.
 [[ -d "/etc/ansible/plugins" ]] && rm -rf "/etc/ansible/plugins"
 
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index a44a9d4dc3..f2ce28ae00 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -55,6 +55,9 @@ export ACTION=${2:-"deploy"}
 # is created. The checkout must always be N-1.
 export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/pike'}
 
+# enable the ARA callback plugin
+export SETUP_ARA=true
+
 ## Change branch for Upgrades ------------------------------------------------
 # If the action is to upgrade, then store the current SHA,
 # checkout the source SHA before executing the greenfield
@@ -103,9 +106,6 @@ fi
 # Bootstrap Ansible
 source "${OSA_CLONE_DIR}/scripts/bootstrap-ansible.sh"
 
-# Install and export the ARA callback plugin
-setup_ara
-
 # Log some data about the instance and the rest of the system
 log_instance_info