diff --git a/composer.json b/composer.json
index d0d12aa3..a4ee8cc2 100644
--- a/composer.json
+++ b/composer.json
@@ -45,7 +45,7 @@
         "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
         "laminas/laminas-navigation": "^2.8",
         "laminas/laminas-router": "^3.0",
-        "laminas/laminas-servicemanager": "~3.5.0",
+        "laminas/laminas-servicemanager": "^3.6",
         "laminas/laminas-session": "^2.5",
         "laminas/laminas-stdlib": "^3.0",
         "laminas/laminas-uri": "^2.5",
diff --git a/composer.lock b/composer.lock
index 77f86ed6..d2bdd908 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1242d2e13217b0e490c5593f6594dfaf",
+    "content-hash": "1c643ddd15f8ef8c051dbd39bab7824a",
     "packages": [
         {
             "name": "brick/varexporter",
@@ -2055,25 +2055,29 @@
         },
         {
             "name": "laminas/laminas-servicemanager",
-            "version": "3.5.2",
+            "version": "3.6.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-servicemanager.git",
-                "reference": "0669e1eec8d9f61e35a5bc5012796d49f418b259"
+                "reference": "b1445e1a7077c21b0fad0974a1b7a11b9dbe0828"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/0669e1eec8d9f61e35a5bc5012796d49f418b259",
-                "reference": "0669e1eec8d9f61e35a5bc5012796d49f418b259",
+                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/b1445e1a7077c21b0fad0974a1b7a11b9dbe0828",
+                "reference": "b1445e1a7077c21b0fad0974a1b7a11b9dbe0828",
                 "shasum": ""
             },
             "require": {
                 "container-interop/container-interop": "^1.2",
                 "laminas/laminas-stdlib": "^3.2.1",
                 "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^5.6 || ^7.0",
+                "php": "^7.3 || ~8.0.0",
                 "psr/container": "^1.0"
             },
+            "conflict": {
+                "laminas/laminas-code": "<3.3.1",
+                "zendframework/zend-code": "<3.3.1"
+            },
             "provide": {
                 "container-interop/container-interop-implementation": "^1.2",
                 "psr/container-implementation": "^1.0"
@@ -2082,27 +2086,24 @@
                 "zendframework/zend-servicemanager": "^3.4.0"
             },
             "require-dev": {
+                "composer/package-versions-deprecated": "^1.0",
                 "laminas/laminas-coding-standard": "~1.0.0",
-                "mikey179/vfsstream": "^1.6.5",
-                "ocramius/proxy-manager": "^1.0 || ^2.0",
-                "phpbench/phpbench": "^0.13.0",
-                "phpunit/phpunit": "^5.7.25 || ^6.4.4"
+                "laminas/laminas-container-config-test": "^0.3",
+                "laminas/laminas-dependency-plugin": "^2.1",
+                "mikey179/vfsstream": "^1.6.8",
+                "ocramius/proxy-manager": "^2.2.3",
+                "phpbench/phpbench": "^1.0.0-alpha3",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.4"
             },
             "suggest": {
-                "laminas/laminas-stdlib": "laminas-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances",
-                "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services"
+                "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services"
             },
             "bin": [
                 "bin/generate-deps-for-config-factory",
                 "bin/generate-factory-for-class"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev",
-                    "dev-develop": "4.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Laminas\\ServiceManager\\": "src/"
@@ -2137,7 +2138,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-01-17T16:54:43+00:00"
+            "time": "2021-02-03T08:44:41+00:00"
         },
         {
             "name": "laminas/laminas-session",
diff --git a/module/Console/Test/Controller/SoftwareControllerTest.php b/module/Console/Test/Controller/SoftwareControllerTest.php
index 2f5eb563..d82a544b 100644
--- a/module/Console/Test/Controller/SoftwareControllerTest.php
+++ b/module/Console/Test/Controller/SoftwareControllerTest.php
@@ -223,7 +223,7 @@ public function testConfirmActionPostConfirmValidNonEmptyList($button, $accept,
         $fixEncodingErrors->method('filter')
                           ->withConsecutive(array('raw1'), array('raw2'))
                           ->willReturnOnConsecutiveCalls('filtered1', 'filtered2');
-        $serviceManager->get('FilterManager')->setService('Library\Filter\FixEncodingErrors', $fixEncodingErrors);
+        $serviceManager->get('FilterManager')->setService('Library\FixEncodingErrors', $fixEncodingErrors);
 
         $viewHelperManager = $serviceManager->get('ViewHelperManager');