diff --git a/tests/Helper/ProfileValidatorTest.php b/tests/Helper/ProfileValidatorTest.php
index 6d806f909..96455215f 100644
--- a/tests/Helper/ProfileValidatorTest.php
+++ b/tests/Helper/ProfileValidatorTest.php
@@ -24,7 +24,7 @@ public function testProfileValidatorWorksWithInvalidProfile($profile): void {
         $this->assertFalse($validator->passes());
     }
 
-    private function validProfileProvider() {
+    public static function validProfileProvider() {
         return [
             ['boring profile with no other' => [
                 'purpose' => 'data_hub',
@@ -41,7 +41,7 @@ private function validProfileProvider() {
         ];
     }
 
-    private function invalidProfileProvider() {
+    public static function invalidProfileProvider() {
         return [
             ['missing other keys' => [
                 'purpose' => 'data_hub',
diff --git a/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php b/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php
index 612eda280..1d538f324 100644
--- a/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php
+++ b/tests/Jobs/CirrusSearch/ElasticSearchIndexInitTest.php
@@ -142,7 +142,30 @@ public function testJobTriggeredButNoSetting() {
      *
      * @expectedException RuntimeException
      */
-    public function testFailure($request, string $expectedFailure, $mockResponse) {
+    public function testFailure(string $expectedFailure, $mockResponse) {
+        $request = $this->createMock(HttpRequest::class);
+        $mockJob = $this->createMock(Job::class);
+        $mockJob->expects($this->once())
+            ->method('fail');
+
+        $request->method('execute')->willReturn(json_encode($mockResponse));
+
+        $job = new ElasticSearchIndexInit($this->wiki->id);
+        $job->setJob($mockJob);
+        $job->handle($request);
+
+        $this->assertSame(
+            1,
+            WikiSetting::where(['wiki_id' => $this->wiki->id, 'name' => WikiSetting::wwExtEnableElasticSearch, 'value' => true])->count()
+        );
+    }
+
+    public function testCurlFailure() {
+        $expectedFailure = 'wbstackElasticSearchInit curl error for <WIKI_ID>: Scary Error!';
+        $mockResponse = [];
+
+        $request = $this->createMock(HttpRequest::class);
+        $request->method('error')->willReturn('Scary Error!');
         $mockJob = $this->createMock(Job::class);
         $mockJob->expects($this->once())
             ->method('fail');
@@ -159,11 +182,10 @@ public function testFailure($request, string $expectedFailure, $mockResponse) {
         );
     }
 
-    public function failureProvider() {
+    public static function failureProvider() {
 
         $mockResponse = [];
         yield [
-            $this->createMock(HttpRequest::class),
             'wbstackElasticSearchInit call for <WIKI_ID>. No wbstackElasticSearchInit key in response: []',
             $mockResponse,
         ];
@@ -177,22 +199,12 @@ public function failureProvider() {
         ];
 
         yield [
-            $this->createMock(HttpRequest::class),
             'wbstackElasticSearchInit call for <WIKI_ID> was not successful:{"warnings":[],"wbstackElasticSearchInit":{"return":0,"output":[]}}',
             $mockResponse,
         ];
 
-        $curlError = $this->createMock(HttpRequest::class);
-        $curlError->method('error')->willReturn('Scary Error!');
-        yield [
-            $curlError,
-            'wbstackElasticSearchInit curl error for <WIKI_ID>: Scary Error!',
-            $mockResponse,
-        ];
-
         $mockResponse['wbstackElasticSearchInit']['return'] = 1;
         yield [
-            $this->createMock(HttpRequest::class),
             'wbstackElasticSearchInit call for <WIKI_ID> was not successful:{"warnings":[],"wbstackElasticSearchInit":{"return":1,"output":[]}}',
             $mockResponse,
         ];