diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index 99e9b52f1..6b98f73a0 100755
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -15,6 +15,8 @@
 set -ex
 
 # Install barbican devstack integration
-export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://git.openstack.org/openstack/barbican"
+if [ -z "$DEVSTACK_LOCAL_CONFIG" ]; then
+    export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican https://git.openstack.org/openstack/barbican"
+fi
 
 $BASE/new/devstack-gate/devstack-vm-gate.sh
diff --git a/functionaltests/post_test_hook.sh b/functionaltests/post_test_hook.sh
index 4d2cad1c4..aea8a5da8 100755
--- a/functionaltests/post_test_hook.sh
+++ b/functionaltests/post_test_hook.sh
@@ -24,4 +24,9 @@ sudo pip install -r /opt/stack/new/barbican/test-requirements.txt
 
 cd /opt/stack/new/barbican/functionaltests
 echo 'Running Functional Tests'
-sudo ./run_tests.sh $plugin
+
+if [ "$DEVSTACK_GATE_USE_PYTHON3" = True ]; then
+    export PYTHON=$(which python3 2>/dev/null)
+fi
+
+sudo -E ./run_tests.sh $plugin