diff --git a/tests/BatchedProcessorTest.php b/tests/BatchedProcessorTest.php
index f48cb58..42f2214 100644
--- a/tests/BatchedProcessorTest.php
+++ b/tests/BatchedProcessorTest.php
@@ -15,10 +15,12 @@ use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateQueuedJobProcessor
 use SilverStripe\FullTextSearch\Search\Processors\SearchUpdateBatchedProcessor;
 use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater;
 use SilverStripe\FullTextSearch\Search\Variants\SearchVariantVersioned;
+use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
+use SilverStripe\Subsites\Model\Subsite;
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Versioned\Versioned;
-use Symbiote\QueuedJobs\Services\QueuedJob;
 use Symbiote\QueuedJobs\Services\QueuedJobService;
+use Symbiote\QueuedJobs\Services\QueuedJob;
 
 /**
  * Tests {@see SearchUpdateQueuedJobProcessor}
@@ -29,9 +31,9 @@ class BatchedProcessorTest extends SapphireTest
 
     protected $oldProcessor;
 
-    protected static $extra_dataobjects = array(
-        BatchedProcessorTest_Object::class
-    );
+    protected static $extra_dataobjects = [
+        BatchedProcessorTest_Object::class,
+    ];
 
     protected static $illegal_extensions = [
         SiteTree::class => [
@@ -203,7 +205,9 @@ class BatchedProcessorTest extends SapphireTest
      */
     public function testSoftCap()
     {
-        $this->markTestSkipped('@todo This test passes in isolation, but not in conjunction with the previous test');
+        $this->markTestSkipped(
+            '@todo PostgreSQL: This test passes in isolation, but not in conjunction with the previous test'
+        );
 
         $index = singleton(BatchedProcessorTest_Index::class);
         $index->reset();
diff --git a/tests/SearchVariantSubsitesTest.php b/tests/SearchVariantSubsitesTest.php
index 6ef6be2..1e43105 100644
--- a/tests/SearchVariantSubsitesTest.php
+++ b/tests/SearchVariantSubsitesTest.php
@@ -31,9 +31,9 @@ class SearchVariantSubsiteTest extends SapphireTest
             self::$index = singleton(static::class);
         }
 
-        Config::inst()->update('Injector', 'SearchUpdateProcessor', array(
-            'class' => 'SearchUpdateImmediateProcessor'
-        ));
+        Config::inst()->update(Injector::class, SearchUpdateProcessor::class, [
+            'class' => SearchUpdateImmediateProcessor::class
+        ]);
 
         FullTextSearch::force_index_list(self::$index);
         SearchUpdater::clear_dirty_indexes();
diff --git a/tests/SolrIndexSubsitesTest.php b/tests/SolrIndexSubsitesTest.php
index b1beb63..7d31019 100644
--- a/tests/SolrIndexSubsitesTest.php
+++ b/tests/SolrIndexSubsitesTest.php
@@ -55,9 +55,9 @@ class SolrIndexSubsitesTest extends SapphireTest
             self::$index = singleton(SolrIndexSubsitesTest_Index::class);
         }
 
-        Config::modify()->set('Injector', 'SearchUpdateProcessor', array(
-            'class' => 'SearchUpdateImmediateProcessor'
-        ));
+        Config::modify()->set(Injector::class, SearchUpdateProcessor::class, [
+            'class' => SearchUpdateImmediateProcessor::class,
+        ]);
 
         FullTextSearch::force_index_list(self::$index);
         SearchUpdater::clear_dirty_indexes();
diff --git a/tests/SolrIndexVersionedTest.php b/tests/SolrIndexVersionedTest.php
index 23b7a66..6940b4e 100644
--- a/tests/SolrIndexVersionedTest.php
+++ b/tests/SolrIndexVersionedTest.php
@@ -46,7 +46,7 @@ class SolrIndexVersionedTest extends SapphireTest
             self::$index = singleton(SolrVersionedTest_Index::class);
         }
 
-        Config::modify()->set(Injector::class, SearchUpdateProcessor::class, array(
+        Config::modify()->set(Injector::class, SearchUpdateProcessor::class, [
             'class' => SearchUpdateImmediateProcessor::class
         ]);