diff --git a/tests/CurrentUserTest.php b/tests/CurrentUserTest.php
index f204eb3bb..8102544c5 100644
--- a/tests/CurrentUserTest.php
+++ b/tests/CurrentUserTest.php
@@ -22,13 +22,14 @@
 namespace OCA\Activity\Tests;
 
 use OCA\Activity\CurrentUser;
+use OCA\Activity\Tests\Mock\Request;
 use OCP\IRequest;
 use OCP\IUser;
+use OCP\IUserSession;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IShare;
-use PHPUnit\Framework\MockObject\MockObject;
-use OCP\IUserSession;
 use OCP\Share\IManager;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Class CurrentUserTest
@@ -45,16 +46,10 @@ class CurrentUserTest extends TestCase {
 	/** @var IManager|MockObject */
 	protected $shareManager;
 
-	/**
-	 * 
-	 */
-
 	protected function setUp(): void {
 		parent::setUp();
 
-		$this->request = $this->getMockBuilder(IRequest::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->request = $this->createMock(Request::class);
 		$this->userSession = $this->createMock(IUserSession::class);
 		$this->shareManager = $this->createMock(IManager::class);
 	}
@@ -189,7 +184,10 @@ public function dataGetCloudIDFromToken(): array {
 	public function testGetCloudIDFromToken(array $server, $share, ?string $expected): void {
 		$instance = $this->getInstance();
 
-		$this->request->server = $server;
+		$this->request->method('__get')->willReturnCallback(fn (string $prop) => match ($prop) {
+				'server' => $server,
+				default => null,
+		});
 
 		if ($share === null) {
 			$this->shareManager->expects($this->never())
diff --git a/tests/Mock/Request.php b/tests/Mock/Request.php
new file mode 100644
index 000000000..b8a5672ce
--- /dev/null
+++ b/tests/Mock/Request.php
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+
+namespace OCA\Activity\Tests\Mock;
+
+use OCP\IRequest;
+
+interface Request extends IRequest {
+	public function __get(string $prop): mixed;
+}