Index: tests/phpunit/tests/multisite/site.php
===================================================================
--- tests/phpunit/tests/multisite/site.php	(revision 35446)
+++ tests/phpunit/tests/multisite/site.php	(working copy)
@@ -1035,6 +1035,41 @@
 	}
 
 	/**
+	 * @ticket 34504
+	 */
+	function test_get_blogaddress_by_name_scheme_reflects_blog_scheme() {
+		$blog = self::factory()->blog->create_and_get();
+		$path = trim( $blog->path, '/' );
+
+		$this->assertSame( 'http', parse_url( get_blogaddress_by_name( $path ), PHP_URL_SCHEME ) );
+
+		update_blog_option( $blog->blog_id, 'home', set_url_scheme( get_blog_option( $blog->blog_id, 'home' ), 'https' ) );
+
+		$this->assertSame( 'https', parse_url( get_blogaddress_by_name( $path ), PHP_URL_SCHEME ) );
+	}
+
+	/**
+	 * @ticket 34504
+	 */
+	function test_get_blogaddress_by_name_scheme_is_unaffected_by_request() {
+		$blog = self::factory()->blog->create_and_get();
+		$path = trim( $blog->path, '/' );
+
+		$this->assertFalse( is_ssl() );
+		$this->assertSame( 'http', parse_url( get_blogaddress_by_name( $path ), PHP_URL_SCHEME ) );
+
+		$_SERVER['HTTPS'] = 'on';
+
+		$is_ssl  = is_ssl();
+		$address = parse_url( get_blogaddress_by_name( $path ), PHP_URL_SCHEME );
+
+		unset( $_SERVER['HTTPS'] );
+
+		$this->assertTrue( $is_ssl );
+		$this->assertSame( 'http', $address );
+	}
+
+	/**
 	 * @ticket 33620
 	 * @dataProvider data_new_blog_url_schemes
 	 */