diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
index 453e10b..387ed52 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
@@ -114,7 +114,7 @@ function ($definition) use ($toolkit_id, $operation) {
   public function createInstance($plugin_id, array $configuration = array(), ImageToolkitInterface $toolkit = NULL, ImageToolkitManager $toolkit_manager = NULL) {
     $plugin_definition = $this->getDefinition($plugin_id);
     $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
-    return new $plugin_class($configuration, $plugin_id, $plugin_definition, $toolkit, $this->logger, $this->toolkitManager);
+    return new $plugin_class($configuration, $plugin_id, $plugin_definition, $toolkit, $this->logger);
   }
 
   /**
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/Bar.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
similarity index 100%
rename from core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/Bar.php
rename to core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/Foo.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
similarity index 100%
rename from core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/Foo.php
rename to core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/FooDerived.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
similarity index 100%
rename from core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/FooDerived.php
rename to core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/OperationBase.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
similarity index 100%
rename from core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/OperationBase.php
rename to core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php