diff --git a/test/results/mastodonsocial.py b/test/results/mastodonsocial.py
index 2ad0dc20..d97d8976 100644
--- a/test/results/mastodonsocial.py
+++ b/test/results/mastodonsocial.py
@@ -18,14 +18,28 @@ __tests__ = (
 },
 
 {
-    "#url"     : "https://mastodon.social/@yoru_nine@pawoo.net",
+    "#url"     : "https://mastodon.social/@ponapalt@ukadon.shillest.net",
     "#category": ("mastodon", "mastodon.social", "user"),
     "#class"   : mastodon.MastodonUserExtractor,
-    "#pattern" : r"https://mastodon\.social/media_proxy/\d+/original",
+    "#pattern" : r"https://files\.mastodon\.social/cache/media_attachments/files/.+/original/\w{16}\.\w+$",
     "#range"   : "1-10",
     "#count"   : 10,
 },
 
+{
+    "#url"     : "https://mastodon.social/@gallerydl",
+    "#comment" : "reblogged/'boosted' posts (#4580)",
+    "#category": ("mastodon", "mastodon.social", "user"),
+    "#class"   : mastodon.MastodonUserExtractor,
+    "#options" : {"reblogs": True},
+    "#archive" : False,
+    "#urls": (
+        "https://files.mastodon.social/media_attachments/files/111/330/852/486/713/967/original/2c25ade55a9d1af2.jpg",
+        "https://files.mastodon.social/media_attachments/files/111/331/603/082/304/823/original/e12cde371c88c1b0.png",
+        "https://files.mastodon.social/media_attachments/files/111/331/603/082/304/823/original/e12cde371c88c1b0.png",
+    ),
+},
+
 {
     "#url"     : "https://mastodon.social/@id:10843",
     "#category": ("mastodon", "mastodon.social", "user"),
@@ -63,11 +77,41 @@ __tests__ = (
 },
 
 {
-    "#url"     : "https://mastodon.social/users/0x4f/following",
+    "#url"     : "https://mastodon.social/@gallerydl/following",
     "#category": ("mastodon", "mastodon.social", "following"),
     "#class"   : mastodon.MastodonFollowingExtractor,
-    "#count"    : ">= 20",
     "#extractor": False,
+    "#urls"     : (
+        "https://mastodon.social/@0x4f",
+        "https://mastodon.social/@RustyBertrand",
+        "https://mastodon.social/@christianselig",
+        "https://saturation.social/@clive",
+        "https://mastodon.social/@sjvn",
+    ),
+
+    "acct"          : str,
+    "avatar"        : r"re:https://files.mastodon.social/.+\.\w+$",
+    "avatar_static" : r"re:https://files.mastodon.social/.+\.\w+$",
+    "bot"           : False,
+    "created_at"    : r"re:\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z",
+    "discoverable"  : True,
+    "display_name"  : str,
+    "emojis"        : [],
+    "fields"        : list,
+    "followers_count": int,
+    "following_count": int,
+    "group"         : False,
+    "header"        : str,
+    "header_static" : str,
+    "id"            : r"re:\d+",
+    "last_status_at": r"re:\d{4}-\d{2}-\d{2}",
+    "locked"        : False,
+    "note"          : str,
+    "statuses_count": int,
+    "uri"           : str,
+    "url"           : str,
+    "username"      : str,
+
 },
 
 {