diff --git a/.travis/run.sh b/.travis/run.sh
index 8f2c64f39a..a671caf9bf 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -16,9 +16,14 @@ elif [[ "$DEVSTACK" == "lms" ]]; then
     make healthchecks.lms healthchecks.discovery validate-lms-volume
     make up-marketing-detached
 else
-    service="$DEVSTACK"
-    make dev.provision.services."$service"
-    make no_cache=True dev.up."$service"
+    case "$DEVSTACK" in
+        # Other services can be added in here seperated by '|', i.e. "registrar|discovery)"
+        registrar)
+            echo "Provisioning LMS first because $DEVSTACK requires it"
+            make dev.provision.services.lms
+    esac
+    make dev.provision.services."$DEVSTACK"
+    make no_cache=True dev.up."$DEVSTACK"
     sleep 60
-    make healthchecks."$service"
+    make healthchecks."$DEVSTACK"
 fi
diff --git a/programs/lms.py b/programs/lms.py
index 8ec55aee72..d3a3f96877 100644
--- a/programs/lms.py
+++ b/programs/lms.py
@@ -31,6 +31,6 @@ def set_current_config(cls, args):
     site=Site.objects.get(domain='example.com'),
     defaults={
         'enabled': True,
-        'values': {'COURSE_CATALOG_API_URL': DISCOVERY_API_URL},
+        'site_values': {'COURSE_CATALOG_API_URL': DISCOVERY_API_URL},
     },
 )