diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index ad0781804..92ec3bbdd 100755
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -49,9 +49,10 @@ setup_gitsvn() {
   rm -rf git-svn
   # There appears to be no way to make git-svn completely shut up, so we
   # redirect its output.
-  git svn -q clone -s $REPO_URL git-svn >/dev/null 2>&1
+  git svn --prefix origin/ -q clone -s $REPO_URL git-svn >/dev/null 2>&1
   (
     cd git-svn
+    git remote add origin https://example.com/fake_refspec
     git config user.name 'TestDood'
     git config user.email 'TestDood@example.com'
   )
diff --git a/tests/upstream.sh b/tests/upstream.sh
index 0e2ce80b0..b264b3e94 100755
--- a/tests/upstream.sh
+++ b/tests/upstream.sh
@@ -19,7 +19,7 @@ setup_gitsvn
 
   git config rietveld.server localhost:8080
 
-  for ref in refs/remotes/trunk refs/remotes/some_branch; do
+  for ref in refs/remotes/origin/trunk refs/remotes/origin/some_branch; do
     git branch -f --set-upstream feature_branch $ref
     git checkout -q feature_branch
     test_expect_success "Guessing upstream branch for $ref" \