diff --git a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
index ebdb593b8d3..f40bdb94014 100644
--- a/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php
@@ -53,11 +53,11 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		);
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testBeforeControllerNoPublicShareController(): void {
 		$controller = $this->createMock(Controller::class);
 
 		$this->middleware->beforeController($controller, 'method');
-		$this->assertTrue(true);
 	}
 
 	public static function dataShareApi(): array {
@@ -157,14 +157,11 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 			->with('token', null)
 			->willReturn('myToken');
 
-		$controller->method('isValidToken')
-			->willReturn(true);
-
-		$controller->method('isPasswordProtected')
+		$controller->expects($this->once())
+			->method('isValidToken')
 			->willReturn(true);
 
 		$this->middleware->beforeController($controller, 'authenticate');
-		$this->assertTrue(true);
 	}
 
 	public function testBeforeControllerValidTokenShowAuthenticateMethod(): void {
@@ -182,14 +179,11 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 			->with('token', null)
 			->willReturn('myToken');
 
-		$controller->method('isValidToken')
-			->willReturn(true);
-
-		$controller->method('isPasswordProtected')
+		$controller->expects($this->once())
+			->method('isValidToken')
 			->willReturn(true);
 
 		$this->middleware->beforeController($controller, 'showAuthenticate');
-		$this->assertTrue(true);
 	}
 
 	public function testBeforeControllerAuthPublicShareController(): void {
diff --git a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php b/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php
index fc32ec650ff..bbcaa713e11 100644
--- a/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php
+++ b/tests/lib/DB/QueryBuilder/Sharded/SharedQueryBuilderTest.php
@@ -65,6 +65,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->assertEquals([], $query->getShardKeys());
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testValidateWithShardKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
@@ -72,9 +73,9 @@ class SharedQueryBuilderTest extends TestCase {
 			->where($query->expr()->eq('storage', $query->createNamedParameter(10)));
 
 		$query->validate();
-		$this->assertTrue(true);
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testValidateWithPrimaryKey(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('fileid', 'path')
@@ -82,7 +83,6 @@ class SharedQueryBuilderTest extends TestCase {
 			->where($query->expr()->in('fileid', $query->createNamedParameter([10, 11], IQueryBuilder::PARAM_INT)));
 
 		$query->validate();
-		$this->assertTrue(true);
 	}
 
 	public function testValidateWithNoKey(): void {
@@ -96,6 +96,7 @@ class SharedQueryBuilderTest extends TestCase {
 		$this->fail('exception expected');
 	}
 
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testValidateNonSharedTable(): void {
 		$query = $this->getQueryBuilder('filecache', 'storage', 'fileid');
 		$query->select('configvalue')
@@ -103,7 +104,6 @@ class SharedQueryBuilderTest extends TestCase {
 			->where($query->expr()->eq('configkey', $query->createNamedParameter('test')));
 
 		$query->validate();
-		$this->assertTrue(true);
 	}
 
 	public function testGetShardKeyMultipleSingleParam(): void {
diff --git a/tests/lib/Files/SimpleFS/InMemoryFileTest.php b/tests/lib/Files/SimpleFS/InMemoryFileTest.php
index 25f0a4a4d03..c5e0f2c0989 100644
--- a/tests/lib/Files/SimpleFS/InMemoryFileTest.php
+++ b/tests/lib/Files/SimpleFS/InMemoryFileTest.php
@@ -45,15 +45,9 @@ class InMemoryFileTest extends TestCase {
 		self::assertEquals('test', $this->testPdf->getContent());
 	}
 
-	/**
-	 * Asserts that delete() doesn't rise an exception.
-	 *
-	 * @return void
-	 */
+	#[\PHPUnit\Framework\Attributes\DoesNotPerformAssertions]
 	public function testDelete(): void {
 		$this->testPdf->delete();
-		// assert true, otherwise phpunit complains about not doing any assert
-		self::assertTrue(true);
 	}
 
 	/**
diff --git a/tests/lib/Repair/ClearFrontendCachesTest.php b/tests/lib/Repair/ClearFrontendCachesTest.php
index de19ad19e31..7e02c07d099 100644
--- a/tests/lib/Repair/ClearFrontendCachesTest.php
+++ b/tests/lib/Repair/ClearFrontendCachesTest.php
@@ -48,6 +48,5 @@ class ClearFrontendCachesTest extends \Test\TestCase {
 			->willReturn($imagePathCache);
 
 		$this->repair->run($this->outputMock);
-		$this->assertTrue(true);
 	}
 }
diff --git a/tests/lib/Talk/BrokerTest.php b/tests/lib/Talk/BrokerTest.php
index 4bac7dd31b2..8fdf2f50f1a 100644
--- a/tests/lib/Talk/BrokerTest.php
+++ b/tests/lib/Talk/BrokerTest.php
@@ -103,10 +103,9 @@ class BrokerTest extends TestCase {
 	}
 
 	public function testNewConversationOptions(): void {
-		$this->broker->newConversationOptions();
+		$options = $this->broker->newConversationOptions();
 
-		// Nothing to assert
-		$this->addToAssertionCount(1);
+		$this->assertInstanceOf(IConversationOptions::class, $options);
 	}
 
 	public function testCreateConversation(): void {