diff --git a/scripts/fetch-develop.deps.sh b/scripts/fetch-develop.deps.sh
index 0d999048dd..65159d1a1b 100755
--- a/scripts/fetch-develop.deps.sh
+++ b/scripts/fetch-develop.deps.sh
@@ -25,7 +25,8 @@ function clone() {
     if [ -n "$branch" ]
     then
         echo "Trying to use $org/$repo#$branch"
-        git clone https://github.com/$org/$repo.git $repo --branch $branch \
+        # Disable auth prompts: https://serverfault.com/a/665959
+        GIT_TERMINAL_PROMPT=0 git clone https://github.com/$org/$repo.git $repo --branch $branch \
             "${GIT_CLONE_ARGS[@]}"
         return $?
     fi
diff --git a/test/app-tests/joining-test.tsx b/test/app-tests/joining-test.tsx
index b5601875b9..2dfaa293b0 100644
--- a/test/app-tests/joining-test.tsx
+++ b/test/app-tests/joining-test.tsx
@@ -77,6 +77,7 @@ describe('joining a room', function() {
             const ROOM_ALIAS = '#alias:localhost';
             const ROOM_ID = '!id:localhost';
 
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
             httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
diff --git a/test/app-tests/loading-test.tsx b/test/app-tests/loading-test.tsx
index d2c7697c7b..bbf8f718b3 100644
--- a/test/app-tests/loading-test.tsx
+++ b/test/app-tests/loading-test.tsx
@@ -313,6 +313,7 @@ describe('loading:', function() {
         });
 
         it('shows the last known room by default', function() {
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities: {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
 
             loadApp();
@@ -332,6 +333,7 @@ describe('loading:', function() {
         it('shows a home page by default if we have no joined rooms', function() {
             localStorage.removeItem("mx_last_room_id");
 
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
 
             loadApp();
@@ -349,6 +351,7 @@ describe('loading:', function() {
         });
 
         it('shows a room view if we followed a room link', function() {
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
 
             loadApp({
@@ -663,6 +666,7 @@ describe('loading:', function() {
             // Wait for another trip around the event loop for the UI to update
             return sleep(1);
         }).then(() => {
+            httpBackend.when('GET', '/capabilities').respond(200, { capabilities : {} });
             httpBackend.when('GET', '/pushrules').respond(200, {});
             return expectAndAwaitSync().catch((e) => {
                 throw new Error("Never got /sync after login: did the client start?");