diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
index 387ed52..b6d3d7e 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationManager.php
@@ -111,7 +111,7 @@ function ($definition) use ($toolkit_id, $operation) {
   /**
    * {@inheritdoc}
    */
-  public function createInstance($plugin_id, array $configuration = array(), ImageToolkitInterface $toolkit = NULL, ImageToolkitManager $toolkit_manager = NULL) {
+  public function createInstance($plugin_id, array $configuration = array(), ImageToolkitInterface $toolkit = 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);
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
index 780dbe5..f3d41c9 100644
--- a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Bar.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\Bar
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\Bar
  */
 
-namespace Drupal\image_test\Plugin\ImageToolkit\Operation;
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
 
 /**
  * Builds an image toolkit operation.
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
index 67938f1..1cf5e38 100644
--- a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/Foo.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\Foo
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\Foo
  */
 
-namespace Drupal\image_test\Plugin\ImageToolkit\Operation;
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
 
 /**
  * Builds an image toolkit operation.
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
index fed0d53..5d129a3 100644
--- a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/FooDerived.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\FooDerived
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\FooDerived
  */
 
-namespace Drupal\image_test\Plugin\ImageToolkit\Operation;
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
 
 /**
  * Builds an image toolkit operation.
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
index 1d9d012..7dc395f 100644
--- a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/Operation/test/OperationBase.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\OperationBase.
+ * Contains \Drupal\image_test\Plugin\ImageToolkit\Operation\test\OperationBase.
  */
 
-namespace Drupal\image_test\Plugin\ImageToolkit\Operation;
+namespace Drupal\image_test\Plugin\ImageToolkit\Operation\test;
 
 use Drupal\Core\ImageToolkit\ImageToolkitOperationBase;