diff --git a/build/integration/features/avatar.feature b/build/integration/features/avatar.feature
index 579417844e..f7926615c0 100644
--- a/build/integration/features/avatar.feature
+++ b/build/integration/features/avatar.feature
@@ -165,3 +165,19 @@ Feature: avatar
       | X-NC-IsCustomAvatar | 1 |
     And last avatar is a square of size 96
     And last avatar is a single "#FF0000" color
+
+
+
+  Scenario: get default guest avatar
+    When user "user0" gets avatar for guest "guest0"
+    Then The following headers should be set
+      | Content-Type | image/png |
+    And last avatar is a square of size 128
+    And last avatar is not a single color
+
+  Scenario: get default guest avatar as an anonymous user
+    When user "anonymous" gets avatar for guest "guest0"
+    Then The following headers should be set
+      | Content-Type | image/png |
+    And last avatar is a square of size 128
+    And last avatar is not a single color
diff --git a/build/integration/features/bootstrap/Avatar.php b/build/integration/features/bootstrap/Avatar.php
index 90cc36067b..388715340c 100644
--- a/build/integration/features/bootstrap/Avatar.php
+++ b/build/integration/features/bootstrap/Avatar.php
@@ -71,6 +71,20 @@ trait Avatar {
 		$this->getLastAvatar();
 	}
 
+	/**
+	 * @When user :user gets avatar for guest :guestAvatar
+	 *
+	 * @param string $user
+	 * @param string $guestAvatar
+	 */
+	public function userGetsAvatarForGuest(string $user, string $guestAvatar) {
+		$this->asAn($user);
+		$this->sendingToDirectUrl('GET', '/index.php/avatar/guest/' . $guestAvatar . '/128');
+		$this->theHTTPStatusCodeShouldBe('201');
+
+		$this->getLastAvatar();
+	}
+
 	/**
 	 * @When logged in user gets temporary avatar
 	 */