diff --git a/src/Tests/ImageEffectsAutoOrientTest.php b/src/Tests/ImageEffectsAutoOrientTest.php
index 1970620..9e5fae6 100644
--- a/src/Tests/ImageEffectsAutoOrientTest.php
+++ b/src/Tests/ImageEffectsAutoOrientTest.php
@@ -30,7 +30,10 @@ class ImageEffectsAutoOrientTest extends ImageEffectsTestBase {
         'scan_exif' => TRUE,
       ],
     ];
-    $this->addEffectToTestStyle($effect);
+    //$this->addEffectToTestStyle($effect);
+    $image_style = ImageStyle::load('image_effects_test');
+    $image_style->addImageEffect($effect);
+    $image_style->save();
 
     // Add a scale effect too.
     $effect = [
@@ -40,7 +43,10 @@ class ImageEffectsAutoOrientTest extends ImageEffectsTestBase {
         'upscale' => TRUE,
       ],
     ];
-    $this->addEffectToTestStyle($effect);
+    //$this->addEffectToTestStyle($effect);
+    $image_style = ImageStyle::load('image_effects_test');
+    $image_style->addImageEffect($effect);
+    $image_style->save();
 
     // Test operations on toolkits.
     $this->executeTestOnToolkits([$this, 'doTestAutoOrientOperations']);
diff --git a/src/Tests/ImageEffectsConvolutionTest.php b/src/Tests/ImageEffectsConvolutionTest.php
index 48108cf..25a5503 100644
--- a/src/Tests/ImageEffectsConvolutionTest.php
+++ b/src/Tests/ImageEffectsConvolutionTest.php
@@ -6,7 +6,7 @@ use Drupal\system\Tests\Image\ToolkitTestBase;
 /**
  * Tests that the image effects pass parameters to the toolkit correctly.
  *
- * @group image
+ * @group Image Effects
  */
 class ImageEffectsConvolutionTest extends ToolkitTestBase {
 
diff --git a/src/Tests/ImageEffectsTestBase.php b/src/Tests/ImageEffectsTestBase.php
index 11f0007..d3b2d9d 100644
--- a/src/Tests/ImageEffectsTestBase.php
+++ b/src/Tests/ImageEffectsTestBase.php
@@ -161,7 +161,9 @@ abstract class ImageEffectsTestBase extends WebTestBase {
           break;
 
         case 'imagemagick':
+debug('imagemagick');
           if ($this->container->get('module_handler')->moduleExists('imagemagick')) {
+debug('imagemagick - installed');
             $this->changeToolkit($toolkit_id);
             \Drupal::configFactory()->getEditable('imagemagick.settings')
               ->set('debug', TRUE)
@@ -170,6 +172,7 @@ abstract class ImageEffectsTestBase extends WebTestBase {
             // available on the shell path.
             $status = \Drupal::service('image.toolkit.manager')->createInstance('imagemagick')->checkPath('');
             if (empty($status['errors'])) {
+debug('imagemagick - checkpath OK');
               call_user_func($method);
             }
             else {