diff --git a/.gitreview b/.gitreview
index 459f3c4a39..3d07874c4d 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=openstack/trove.git
+defaultbranch=stable/pike
diff --git a/devstack/settings b/devstack/settings
index 02632a66c1..0da3a06e8c 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -36,7 +36,7 @@ TROVE_MAX_ACCEPTED_VOLUME_SIZE=${TROVE_MAX_ACCEPTED_VOLUME_SIZE}
 TROVE_MAX_INSTANCES_PER_TENANT=${TROVE_MAX_INSTANCES_PER_TENANT}
 TROVE_MAX_VOLUMES_PER_TENANT=${TROVE_MAX_VOLUMES_PER_TENANT}
 TROVE_AGENT_CALL_LOW_TIMEOUT=${TROVE_AGENT_CALL_LOW_TIMEOUT}
-TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT}
+TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200}
 TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT}
 TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT}
 TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME}
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 69e8149ec9..5b7ba6bb7c 100755
--- a/integration/scripts/trovestack
+++ b/integration/scripts/trovestack
@@ -1291,7 +1291,7 @@ function cmd_dsvm_gate_tests() {
 
     local DATASTORE_TYPE=${1:-'mysql'}
     local TEST_GROUP=${2:-${DATASTORE_TYPE}}
-    local HOST_SCP_USERNAME=${3:-'jenkins'}
+    local HOST_SCP_USERNAME=${3:-$USER}
     local GUEST_USERNAME=${4:-'ubuntu'}
     local CONTROLLER_IP=${5:-$ACTUAL_HOSTNAME}
     local ESCAPED_PATH_TROVE=${6:-'\/opt\/stack\/new\/trove'}
@@ -1330,8 +1330,8 @@ function cmd_dsvm_gate_tests() {
     export TROVE_REPORT_DIR=$HOME/dsvm-report/
     TROVESTACK_DUMP_ENV=true
 
-    # Devstack vm-gate runs as the jenkins user, but needs to connect to the guest image as ubuntu
-    echo "User=ubuntu" >> /home/jenkins/.ssh/config
+    # Devstack vm-gate runs as a non-ubuntu user, but needs to connect to the guest image as ubuntu
+    echo "User=ubuntu" >> /home/$USER/.ssh/config
 
     # Fix iptables rules that prevent amqp connections from the devstack box to the guests
     sudo iptables -D openstack-INPUT -j REJECT --reject-with icmp-host-prohibited || true
diff --git a/tox.ini b/tox.ini
index 4b294691f7..22001a32eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
 usedevelop = True
 install_command = pip install \
-                  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} \
+                  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} \
                   -U {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt