diff --git a/src/ImagemagickExecManager.php b/src/ImagemagickExecManager.php
index 3b90071..44d1f8b 100644
--- a/src/ImagemagickExecManager.php
+++ b/src/ImagemagickExecManager.php
@@ -88,7 +88,7 @@ class ImagemagickExecManager implements ImagemagickExecManagerInterface {
    *
    * @return $this
    *
-   * @todo in next major, add this method to the interface. 
+   * @todo in next major, add this method to the interface.
    */
   public function setTimeout($timeout) {
     $this->timeout = $timeout;
diff --git a/tests/src/Functional/ToolkitImagemagickTest.php b/tests/src/Functional/ToolkitImagemagickTest.php
index a0de9c7..f021fbc 100644
--- a/tests/src/Functional/ToolkitImagemagickTest.php
+++ b/tests/src/Functional/ToolkitImagemagickTest.php
@@ -88,7 +88,7 @@ class ToolkitImagemagickTest extends BrowserTestBase {
    * @param bool $check_path
    *   Whether the path to binaries should be tested.
    */
-  protected function setUpToolkit($binaries, $test_path = TRUE) {
+  protected function setUpToolkit($binaries, $check_path = TRUE) {
     // Change the toolkit.
     \Drupal::configFactory()->getEditable('system.image')
       ->set('toolkit', 'imagemagick')
@@ -101,7 +101,7 @@ class ToolkitImagemagickTest extends BrowserTestBase {
       ->set('quality', 100)
       ->save();
 
-    if ($test_path) {
+    if ($check_path) {
       // The test can only be executed if binaries are available on the shell
       // path.
       $status = \Drupal::service('image.toolkit.manager')->createInstance('imagemagick')->checkPath('');
@@ -352,9 +352,9 @@ class ToolkitImagemagickTest extends BrowserTestBase {
         if ($package === 'graphicsmagick') {
           // @todo Issues with crop and convert on GIF files, investigate.
           if (in_array($file, [
-              'image-test.gif', 'image-test-no-transparency.gif'
+              'image-test.gif', 'image-test-no-transparency.gif',
             ]) && in_array($op, [
-              'crop', 'scale_and_crop', 'convert_png'
+              'crop', 'scale_and_crop', 'convert_png',
             ])) {
             continue;
           }