diff --git a/tests/phpunit/unit/includes/resourceloader/DerivativeResourceLoaderContextTest.php b/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
similarity index 98%
rename from tests/phpunit/unit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
rename to tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
index eeecf614128..17f5bdfcf5d 100644
--- a/tests/phpunit/unit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
+++ b/tests/phpunit/includes/resourceloader/DerivativeResourceLoaderContextTest.php
@@ -4,7 +4,7 @@
  * @group ResourceLoader
  * @covers DerivativeResourceLoaderContext
  */
-class DerivativeResourceLoaderContextTest extends PHPUnit\Framework\TestCase {
+class DerivativeResourceLoaderContextTest extends MediaWikiIntegrationTestCase {
 
 	use MediaWikiCoversValidator;
 
diff --git a/tests/phpunit/unit/includes/libs/uuid/GlobalIdGeneratorTest.php b/tests/phpunit/unit/includes/libs/uuid/GlobalIdGeneratorTest.php
index 9aecd2b0e44..2cd30031414 100644
--- a/tests/phpunit/unit/includes/libs/uuid/GlobalIdGeneratorTest.php
+++ b/tests/phpunit/unit/includes/libs/uuid/GlobalIdGeneratorTest.php
@@ -190,7 +190,7 @@ class GlobalIdGeneratorTest extends PHPUnit\Framework\TestCase {
 	 * @param string $uuid
 	 * @param string $ts
 	 * @dataProvider provideGetTimestampFromUUIDv1
-	 * @covers UIDGenerator::getTimestampFromUUIDv1
+	 * @covers \Wikimedia\UUID\GlobalIdGenerator::getTimestampFromUUIDv1
 	 */
 	public function testGetTimestampFromUUIDv1( string $uuid, string $ts ) {
 		$this->assertEquals( $ts, $this->globalIdGenerator->getTimestampFromUUIDv1( $uuid ) );
@@ -208,11 +208,11 @@ class GlobalIdGeneratorTest extends PHPUnit\Framework\TestCase {
 	/**
 	 * @param string $uuid
 	 * @dataProvider provideGetTimestampFromUUIDv1InvalidUUIDv1
-	 * @covers UIDGenerator::getTimestampFromUUIDv1
+	 * @covers \Wikimedia\UUID\GlobalIdGenerator::getTimestampFromUUIDv1
 	 */
 	public function testGetTimestampFromUUIDv1InvalidUUIDv1( string $uuid ) {
 		$this->expectException( InvalidArgumentException::class );
-		UIDGenerator::getTimestampFromUUIDv1( $uuid );
+		$this->globalIdGenerator->getTimestampFromUUIDv1( $uuid );
 	}
 
 	protected function setUp() : void {