diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh
index 51ebaa7274..1e7f23a24e 100755
--- a/magnum/tests/contrib/gate_hook.sh
+++ b/magnum/tests/contrib/gate_hook.sh
@@ -22,7 +22,7 @@ export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/opens
 export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
 
 if [ "$coe" = "mesos" ]; then
-    echo "MAGNUM_GUEST_IMAGE_URL="https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2"" >> $BASE/new/devstack/localrc
+    export DEVSTACK_LOCAL_CONFIG+=$'\n'"MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-14.04.3-mesos-0.25.0.qcow2"
 fi
 
 $BASE/new/devstack-gate/devstack-vm-gate.sh
diff --git a/magnum/tests/functional/common/manager.py b/magnum/tests/functional/common/manager.py
index 156d9af656..b601399418 100644
--- a/magnum/tests/functional/common/manager.py
+++ b/magnum/tests/functional/common/manager.py
@@ -26,7 +26,7 @@ class Manager(clients.Manager):
         if not credentials:
             credentials = common_creds.get_configured_credentials(
                 'identity_admin')
-        super(Manager, self).__init__(credentials, 'container')
+        super(Manager, self).__init__(credentials)
         self.auth_provider.orig_base_url = self.auth_provider.base_url
         self.auth_provider.base_url = self.bypassed_base_url
         if request_type == 'baymodel':