diff --git a/tests/Unit/Activity/ProviderTest.php b/tests/Unit/Activity/ProviderTest.php
index 00ade6705..270a1768b 100644
--- a/tests/Unit/Activity/ProviderTest.php
+++ b/tests/Unit/Activity/ProviderTest.php
@@ -375,8 +375,7 @@ public function testGetRichParams(string $subject, array $subjectParams, array $
 			->willReturn($form);
 
 		$this->validator->expects($this->any())
-			->method('validate')
-			->willReturn(true);
+			->method('validate');
 
 		$this->assertEquals($expected, $this->provider->getRichParams($l10n, $subject, $subjectParams));
 	}
diff --git a/tests/Unit/FormsMigratorTest.php b/tests/Unit/FormsMigratorTest.php
index e11e57ba8..0de9ed69d 100644
--- a/tests/Unit/FormsMigratorTest.php
+++ b/tests/Unit/FormsMigratorTest.php
@@ -83,11 +83,6 @@ class FormsMigratorTest extends TestCase {
 	public function setUp(): void {
 		parent::setUp();
 
-		// UserMigration is not available below NC24, skip all tests here.
-		if (\OC_Util::getVersion()[0] < 24) {
-			$this->markTestSkipped('UserMigration not available below NC24');
-		}
-
 		$this->answerMapper = $this->createMock(AnswerMapper::class);
 		$this->formMapper = $this->createMock(FormMapper::class);
 		$this->optionMapper = $this->createMock(OptionMapper::class);