diff --git a/tests/code_coverage_upload.sh b/tests/code_coverage_upload.sh
index 7ab9494b..3231d9a5 100755
--- a/tests/code_coverage_upload.sh
+++ b/tests/code_coverage_upload.sh
@@ -24,11 +24,12 @@ fi
 
 # Workaround for rsync not creating target directories with depth > 1
 mv "$LDIRNAME" "x$LDIRNAME"
-mkdir -p "$RDIRNAME/$TRAVIS_BUILD_NUMBER"
-mv "x$LDIRNAME" "$RDIRNAME/$TRAVIS_BUILD_NUMBER/PHP-$TRAVIS_PHP_VERSION/"
+RROOT="$RDIRNAME/$TRAVIS_BRANCH/$TRAVIS_BUILD_NUMBER"
+mkdir -p "$RROOT"
+mv "x$LDIRNAME" "$RROOT/PHP-$TRAVIS_PHP_VERSION/"
 
 # Update latest symlink
-ln -s "$TRAVIS_BUILD_NUMBER" "$RDIRNAME/latest"
+ln -s "$TRAVIS_BUILD_NUMBER" "$RDIRNAME/$TRAVIS_BRANCH/latest"
 
 # Stop complaints about world-readable key file.
 chmod 600 "$ID_RSA"