diff --git a/tests/integration/testClasses/Binding/SomeClass.php b/tests/integration/testClasses/Binding/SomeClass.php
index af62a8262b..b856849251 100644
--- a/tests/integration/testClasses/Binding/SomeClass.php
+++ b/tests/integration/testClasses/Binding/SomeClass.php
@@ -38,7 +38,7 @@ class SomeClass
         $this->someImplementation = $someImplementation;
     }
 
-    public function get() : SomeInterface
+    public function get(): SomeInterface
     {
         return $this->someImplementation;
     }
diff --git a/tests/unit/Espo/Core/InjectableFactoryTest.php b/tests/unit/Espo/Core/InjectableFactoryTest.php
index 9f024f17e1..30a2f562c2 100644
--- a/tests/unit/Espo/Core/InjectableFactoryTest.php
+++ b/tests/unit/Espo/Core/InjectableFactoryTest.php
@@ -42,9 +42,17 @@ use tests\integration\testClasses\Binding\{
     SomeClass,
 };
 
+use tests\unit\testClasses\Core\Binding\{
+    SomeClass0,
+    SomeClass1,
+    SomeInterface1,
+    SomeClass2,
+    SomeInterface2,
+};
+
 class InjectableFactoryTest extends \PHPUnit\Framework\TestCase
 {
-    public function testCreateWithBinding(): void
+    public function testCreateWithBinding1(): void
     {
         $container = $this->createMock(Container::class);
 
@@ -64,4 +72,23 @@ class InjectableFactoryTest extends \PHPUnit\Framework\TestCase
 
         $this->assertSame($instance, $obj->get());
     }
+
+    public function testCreateWithBinding2(): void
+    {
+        $container = $this->createMock(Container::class);
+
+        $injectableFactory = new InjectableFactory($container);
+
+        $bindingData = new BindingData();
+
+        $binder = new Binder($bindingData);
+
+        $binder
+            ->bindImplementation(SomeInterface1::class, SomeClass1::class)
+            ->bindImplementation(SomeInterface2::class, SomeClass2::class);
+
+        $obj = $injectableFactory->createWithBinding(SomeClass0::class, new BindingContainer($bindingData));
+
+        $this->assertNotNull($obj);
+    }
 }
diff --git a/tests/unit/testClasses/Core/Binding/SomeClass0.php b/tests/unit/testClasses/Core/Binding/SomeClass0.php
new file mode 100644
index 0000000000..a3f460e867
--- /dev/null
+++ b/tests/unit/testClasses/Core/Binding/SomeClass0.php
@@ -0,0 +1,40 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\testClasses\Core\Binding;
+
+class SomeClass0
+{
+    private $dep;
+
+    public function __construct(SomeInterface1 $dep)
+    {
+        $this->dep = $dep;
+    }
+}
diff --git a/tests/unit/testClasses/Core/Binding/SomeClass1.php b/tests/unit/testClasses/Core/Binding/SomeClass1.php
new file mode 100644
index 0000000000..60b2ae22e3
--- /dev/null
+++ b/tests/unit/testClasses/Core/Binding/SomeClass1.php
@@ -0,0 +1,40 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\testClasses\Core\Binding;
+
+class SomeClass1 implements SomeInterface1
+{
+    private $dep;
+
+    public function __construct(SomeInterface2 $dep)
+    {
+        $this->dep = $dep;
+    }
+}
diff --git a/tests/unit/testClasses/Core/Binding/SomeClass2.php b/tests/unit/testClasses/Core/Binding/SomeClass2.php
new file mode 100644
index 0000000000..60a46f61c3
--- /dev/null
+++ b/tests/unit/testClasses/Core/Binding/SomeClass2.php
@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\testClasses\Core\Binding;
+
+class SomeClass2 implements SomeInterface2
+{
+
+}
diff --git a/tests/unit/testClasses/Core/Binding/SomeInterface1.php b/tests/unit/testClasses/Core/Binding/SomeInterface1.php
new file mode 100644
index 0000000000..8b2b0cb1e0
--- /dev/null
+++ b/tests/unit/testClasses/Core/Binding/SomeInterface1.php
@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\testClasses\Core\Binding;
+
+interface SomeInterface1
+{
+
+}
diff --git a/tests/unit/testClasses/Core/Binding/SomeInterface2.php b/tests/unit/testClasses/Core/Binding/SomeInterface2.php
new file mode 100644
index 0000000000..68023e919d
--- /dev/null
+++ b/tests/unit/testClasses/Core/Binding/SomeInterface2.php
@@ -0,0 +1,35 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace tests\unit\testClasses\Core\Binding;
+
+interface SomeInterface2
+{
+
+}