diff --git a/tests/php/Caching/ProxyCacheAdapterTest.php b/tests/php/Caching/ProxyCacheAdapterTest.php
index 8d0a126f..267effdb 100644
--- a/tests/php/Caching/ProxyCacheAdapterTest.php
+++ b/tests/php/Caching/ProxyCacheAdapterTest.php
@@ -174,7 +174,7 @@ protected function getMockCacheInterface()
     {
         $methods = ['get', 'set', 'has', 'delete', 'getMultiple', 'setMultiple', 'clear', 'deleteMultiple'];
         $mock = $this->getMockBuilder(CacheInterface::class)
-            ->setMethods($methods)
+            ->onlyMethods($methods)
             ->getMock();
 
         return $mock;
diff --git a/tests/php/GridFieldArchiveActionTest.php b/tests/php/GridFieldArchiveActionTest.php
index 1bfd60c8..2d096c5d 100644
--- a/tests/php/GridFieldArchiveActionTest.php
+++ b/tests/php/GridFieldArchiveActionTest.php
@@ -192,9 +192,9 @@ public function testGetArchiveAction()
     protected function createGridField()
     {
         $mock = $this->getMockBuilder(Controller::class)
-            ->setMethods(['Link'])
+            ->onlyMethods(['Link'])
             ->getMock();
-        $mock->method('Link')->will($this->returnValue('Test'));
+        $mock->method('Link')->willReturn('Test');
         $form = new Form(
             $mock,
             'TestForm',
diff --git a/tests/php/ReadingModeTest.php b/tests/php/ReadingModeTest.php
index 4861a261..43952269 100644
--- a/tests/php/ReadingModeTest.php
+++ b/tests/php/ReadingModeTest.php
@@ -5,17 +5,17 @@
 use InvalidArgumentException;
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Versioned\ReadingMode;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class ReadingModeTest extends SapphireTest
 {
     /**
-     * @dataProvider provideReadingModes()
-     *
      * @param string $readingMode
      * @param array $dataQuery
      * @param array $queryStringArray
      * @param string $queryString
      */
+    #[DataProvider('provideReadingModes')]
     public function testToDataQueryParams($readingMode, $dataQuery, $queryStringArray, $queryString)
     {
         $this->assertEquals(
@@ -25,13 +25,12 @@ public function testToDataQueryParams($readingMode, $dataQuery, $queryStringArra
         );
     }
     /**
-     * @dataProvider provideReadingModes()
-     *
      * @param string $readingMode
      * @param array $dataQuery
      * @param array $queryStringArray
      * @param string $queryString
      */
+    #[DataProvider('provideReadingModes')]
     public function testFromDataQueryParameters($readingMode, $dataQuery, $queryStringArray, $queryString)
     {
         $this->assertEquals(
@@ -42,13 +41,12 @@ public function testFromDataQueryParameters($readingMode, $dataQuery, $queryStri
     }
 
     /**
-     * @dataProvider provideReadingModes()
-     *
      * @param string $readingMode
      * @param array $dataQuery
      * @param array $queryStringArray
      * @param string $queryString
      */
+    #[DataProvider('provideReadingModes')]
     public function testToQueryString($readingMode, $dataQuery, $queryStringArray, $queryString)
     {
         $this->assertEquals(
@@ -59,13 +57,12 @@ public function testToQueryString($readingMode, $dataQuery, $queryStringArray, $
     }
 
     /**
-     * @dataProvider provideReadingModes()
-     *
      * @param string $readingMode
      * @param array $dataQuery
      * @param array $queryStringArray
      * @param string $queryString
      */
+    #[DataProvider('provideReadingModes')]
     public function testFromQueryString($readingMode, $dataQuery, $queryStringArray, $queryString)
     {
         $this->assertEquals(
@@ -88,7 +85,7 @@ public function testFromQueryString($readingMode, $dataQuery, $queryStringArray,
      *  - query string (string)
      * @return array
      */
-    public function provideReadingModes()
+    public static function provideReadingModes()
     {
         return [
             // Draft
@@ -147,16 +144,16 @@ public function provideReadingModes()
     }
 
     /**
-     * @dataProvider provideTestInvalidStage
      * @param string $stage
      */
+    #[DataProvider('provideTestInvalidStage')]
     public function testInvalidStage($stage)
     {
         $this->expectException(\InvalidArgumentException::class);
         ReadingMode::validateStage($stage);
     }
 
-    public function provideTestInvalidStage()
+    public static function provideTestInvalidStage()
     {
         return [
             [''],
diff --git a/tests/php/RecursiveStagesServiceTest.php b/tests/php/RecursiveStagesServiceTest.php
index 6458ce8f..d98c4676 100644
--- a/tests/php/RecursiveStagesServiceTest.php
+++ b/tests/php/RecursiveStagesServiceTest.php
@@ -8,6 +8,7 @@
 use SilverStripe\Versioned\Tests\RecursiveStagesServiceTest\GroupObject;
 use SilverStripe\Versioned\Tests\RecursiveStagesServiceTest\PrimaryObject;
 use SilverStripe\Versioned\Versioned;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class RecursiveStagesServiceTest extends SapphireTest
 {
@@ -51,9 +52,7 @@ public function testStageDiffersRecursiveWithInvalidObject(): void
         });
     }
 
-    /**
-     * @dataProvider objectsProvider
-     */
+    #[DataProvider('objectsProvider')]
     public function testStageDiffersRecursive(string $class, string $identifier, bool $delete, bool $expected): void
     {
         Versioned::withVersionedMode(function () use ($class, $identifier, $delete, $expected): void {
@@ -81,7 +80,7 @@ public function testStageDiffersRecursive(string $class, string $identifier, boo
         });
     }
 
-    public function objectsProvider(): array
+    public static function objectsProvider(): array
     {
         return [
             'primary object (versioned, update)' => [
diff --git a/tests/php/VersionedNumberCacheTest.php b/tests/php/VersionedNumberCacheTest.php
index 213856e3..692c1427 100644
--- a/tests/php/VersionedNumberCacheTest.php
+++ b/tests/php/VersionedNumberCacheTest.php
@@ -6,6 +6,7 @@
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\Versioned\Tests\VersionedTest\TestObject;
 use ReflectionMethod;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 /**
  * @internal Only test the right values are returned, not that the cache is actually used.
@@ -68,7 +69,7 @@ protected function setUp(): void
         TestObject::singleton()->flushCache();
     }
 
-    public function cacheDataProvider()
+    public static function cacheDataProvider()
     {
         return [
             [Versioned::DRAFT, 'publishedID', false, 'draftVersion'],
@@ -81,9 +82,7 @@ public function cacheDataProvider()
     }
 
 
-    /**
-     * @dataProvider cacheDataProvider
-     */
+    #[DataProvider('cacheDataProvider')]
     public function testVersionNumberCache($stage, $ID, $cache, $expected)
     {
         $actual = Versioned::get_versionnumber_by_stage(TestObject::class, $stage, VersionedNumberCacheTest::${$ID}, $cache);
@@ -96,9 +95,7 @@ public function testVersionNumberCache($stage, $ID, $cache, $expected)
         }
     }
 
-    /**
-     * @dataProvider cacheDataProvider
-     */
+    #[DataProvider('cacheDataProvider')]
     public function testPrepopulatedVersionNumberCache($stage, $ID, $cache, $expected)
     {
         $owner = TestObject::singleton();