diff --git a/tests/php/ContentReviewBaseTest.php b/tests/php/ContentReviewBaseTest.php
deleted file mode 100644
index 0ac0015..0000000
--- a/tests/php/ContentReviewBaseTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace SilverStripe\ContentReview\Tests;
-
-use SilverStripe\Dev\FunctionalTest;
-use SilverStripe\CMS\Model\SiteTree;
-
-/**
- * Extend this class when writing unit tests which are compatible with other modules.
- * All compatibility code goes here.
- */
-abstract class ContentReviewBaseTest extends FunctionalTest
-{
-    /**
-     * @var bool
-     */
-    protected $translatableEnabledBefore;
-}
diff --git a/tests/php/ContentReviewCMSPageEditControllerTest.php b/tests/php/ContentReviewCMSPageEditControllerTest.php
index 5f5e048..2b7c3ef 100644
--- a/tests/php/ContentReviewCMSPageEditControllerTest.php
+++ b/tests/php/ContentReviewCMSPageEditControllerTest.php
@@ -16,8 +16,9 @@
 use SilverStripe\Security\Group;
 use SilverStripe\Security\Member;
 use SilverStripe\SiteConfig\SiteConfig;
+use SilverStripe\Dev\FunctionalTest;
 
-class ContentReviewCMSPageEditControllerTest extends ContentReviewBaseTest
+class ContentReviewCMSPageEditControllerTest extends FunctionalTest
 {
     /**
      * @var string
diff --git a/tests/php/Extensions/ContentReviewCMSExtensionTest.php b/tests/php/Extensions/ContentReviewCMSExtensionTest.php
index a3a0401..ffff61c 100644
--- a/tests/php/Extensions/ContentReviewCMSExtensionTest.php
+++ b/tests/php/Extensions/ContentReviewCMSExtensionTest.php
@@ -21,7 +21,7 @@ class ContentReviewCMSExtensionTest extends SapphireTest
     public function testReviewContentForm()
     {
         $mock = $this->getMockBuilder(ContentReviewCMSExtension::class)
-            ->setMethods(['getReviewContentForm'])
+            ->onlyMethods(['getReviewContentForm'])
             ->getMock();
 
         $mock->expects($this->once())->method('getReviewContentForm')->with(123)->willReturn(true);
@@ -45,7 +45,7 @@ public function testGetReviewContentFormThrowsExceptionWhenObjectCannotBeReviewe
         $this->logOut();
 
         $mock = $this->getMockBuilder(ContentReviewCMSExtension::class)
-            ->setMethods(['findRecord'])
+            ->onlyMethods(['findRecord'])
             ->getMock();
 
         $mock->setOwner(new Controller);
@@ -62,7 +62,7 @@ public function testGetReviewContentFormThrowsExceptionWhenObjectCannotBeReviewe
     public function testSaveReviewCallsHandler()
     {
         $mock = $this->getMockBuilder(ContentReviewCMSExtension::class)
-            ->setMethods(['findRecord', 'getReviewContentHandler'])
+            ->onlyMethods(['findRecord', 'getReviewContentHandler'])
             ->getMock();
 
         $mock->setOwner(new Controller);
@@ -71,7 +71,7 @@ public function testSaveReviewCallsHandler()
         $mock->expects($this->once())->method('findRecord')->willReturn($mockPage);
 
         $mockHandler = $this->getMockBuilder(ReviewContentHandler::class)
-            ->setMethods(['submitReview'])
+            ->onlyMethods(['submitReview'])
             ->getMock();
 
         $mockHandler->expects($this->once())
diff --git a/tests/php/Forms/ReviewContentHandlerTest.php b/tests/php/Forms/ReviewContentHandlerTest.php
index a544562..76e4904 100644
--- a/tests/php/Forms/ReviewContentHandlerTest.php
+++ b/tests/php/Forms/ReviewContentHandlerTest.php
@@ -63,7 +63,7 @@ public function testAddReviewNoteCalledWhenSubmittingReview()
 
         $mock = $this->getMockBuilder(ReviewContentHandler::class)
             ->setConstructorArgs([$controller])
-            ->setMethods(['canSubmitReview'])
+            ->onlyMethods(['canSubmitReview'])
             ->getMock();
 
         $mock->expects($this->exactly(3))->method('canSubmitReview')->willReturn(true);
diff --git a/tests/php/SiteTreeContentReviewTest.php b/tests/php/SiteTreeContentReviewTest.php
index 3b1eb20..51935ba 100644
--- a/tests/php/SiteTreeContentReviewTest.php
+++ b/tests/php/SiteTreeContentReviewTest.php
@@ -18,11 +18,17 @@
 use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\ORM\ArrayList;
+use SilverStripe\Dev\FunctionalTest;
+use SilverStripe\ContentReview\Tests\SiteTreeContentReviewTestPage;
 
-class SiteTreeContentReviewTest extends ContentReviewBaseTest
+class SiteTreeContentReviewTest extends FunctionalTest
 {
     protected $usesTransactions = false;
 
+    protected static $extra_dataobjects = [
+        SiteTreeContentReviewTestPage::class,
+    ];
+
     /**
      * @var string
      */
@@ -372,14 +378,8 @@ public function testPermissionCheckByOnDataObject()
     {
         $reviewer = $this->objFromFixture(Member::class, 'editor');
 
-        // Mock Page class with canReviewContent method to return true on first call and false on second call
-        $mock = $this->getMockBuilder(Page::class)
-            ->setMethods(['canReviewContent', 'NextReviewDate', 'OwnerUsers'])
-            ->getMock();
-        $mock->expects($this->exactly(2))->method('canReviewContent')->willReturnOnConsecutiveCalls(false, true);
-        $mock->method('NextReviewDate')->willReturn('2020-02-20 12:00:00');
-        $mock->method('OwnerUsers')->willReturn(ArrayList::create([$reviewer]));
-        $mock->ContentReviewType = 'Custom';
+        $mock = new SiteTreeContentReviewTestPage();
+        $mock->setReviewer($reviewer);
 
         /** @var SiteTreeContentReview $extension */
         $extension = Injector::inst()->get(SiteTreeContentReview::class);
diff --git a/tests/php/SiteTreeContentReviewTestPage.php b/tests/php/SiteTreeContentReviewTestPage.php
new file mode 100644
index 0000000..5412fad
--- /dev/null
+++ b/tests/php/SiteTreeContentReviewTestPage.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace SilverStripe\ContentReview\Tests;
+
+use Page;
+use SilverStripe\Dev\TestOnly;
+use SilverStripe\ORM\ArrayList;
+
+/**
+ * Mock Page class with canReviewContent method to return false on first call
+ * and true on second call
+ */
+class SiteTreeContentReviewTestPage extends Page implements TestOnly
+{
+    public $ContentReviewType = 'Custom';
+
+    private $i = 0;
+
+    private $reviewer;
+
+    public function setReviewer($reviewer)
+    {
+        $this->reviewer = $reviewer;
+    }
+
+    public function canReviewContent()
+    {
+        $this->i++;
+        return $this->i === 1 ? false : true;
+    }
+
+    public function NextReviewDate()
+    {
+        return '2020-02-20 12:00:00';
+    }
+
+    public function OwnerUsers()
+    {
+        return ArrayList::create([$this->reviewer]);
+    }
+}