diff --git a/imageapi_optimize_binaries.info.yml b/imageapi_optimize_binaries.info.yml
index b87e270bac7fae0d15b8f17316bf50419edbcba3..5ab3c55a0943fe49b0c0ece9de04fb5e70cd199e 100644
--- a/imageapi_optimize_binaries.info.yml
+++ b/imageapi_optimize_binaries.info.yml
@@ -2,7 +2,6 @@ name: Image Optimize - Binaries
 type: module
 package: Image Optimize
 description: 'Provide image optimization plugins that use locally installed binaries.'
-core: 8.x
-core_version_requirement: ^8 || ^9
+core_version_requirement: ^8 || ^9 || ^10
 dependencies:
   - imageapi_optimize:imageapi_optimize
diff --git a/tests/src/Unit/BinaryTestCase.php b/tests/src/Unit/BinaryTestCase.php
index cfdc2b690606aa06110b7b8bc9a6fb7ddee35b90..4d113b443bc025560a5ea1ac011cee59efc59e44 100644
--- a/tests/src/Unit/BinaryTestCase.php
+++ b/tests/src/Unit/BinaryTestCase.php
@@ -17,9 +17,7 @@ abstract class BinaryTestCase extends UnitTestCase {
 
 
   protected function getImageFactoryMock() {
-    return $this->getMockBuilder('\Drupal\Core\Image\ImageFactory')
-      ->disableOriginalConstructor()
-      ->getMock();
+    return $this->createMock('\Drupal\Core\Image\ImageFactory');
   }
 
   protected function getFileSystemMock() {
@@ -30,9 +28,7 @@ abstract class BinaryTestCase extends UnitTestCase {
   }
 
   protected function getShellOperationsMock() {
-    $shellOperationsMock =  $this->getMockBuilder('\Drupal\imageapi_optimize_binaries\ImageAPIOptimizeShellOperationsInterface')
-      ->setMethods(['findExecutablePath', 'execShellCommand', 'saveCommandStdoutToFile'])
-      ->getMock();
+    $shellOperationsMock =  $this->createMock('\Drupal\imageapi_optimize_binaries\ImageAPIOptimizeShellOperationsInterface');
 
     $shellOperationsMock
       ->method('findExecutablePath')->will($this->returnArgument(0));