diff --git a/tests/push-basic.sh b/tests/push-basic.sh
index f84cdeca7e..18936c1c8e 100755
--- a/tests/push-basic.sh
+++ b/tests/push-basic.sh
@@ -45,7 +45,7 @@ setup_gitgit
        $URL/edit
 
   test_expect_success "Base URL contains branch name" \
-      "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:' | grep -q '@master'"
+      "curl -s $($GIT_CL_STATUS --field=url) | grep 'URL:[[:space:]]*[^<]' | grep -q '@master'"
 
   test_expect_success "git-cl push ok" \
     "$GIT_CL push -f"
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 46d34de36d..4c1901065a 100755
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -100,7 +100,7 @@ setup_initgit() {
     git commit -qam "second commit"
     # Hack: make sure master is not the current branch
     #       otherwise push will give a warning
-    git checkout -q -b foo
+    git checkout -q --detach master
   )
 }