diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php
index 020b105ae4aed388e07694de1ff31c17e32c37ec..9d5d23aecd61c35a5332ebc81c0092f35f5d6ab0 100644
--- a/module/VuFind/config/module.config.php
+++ b/module/VuFind/config/module.config.php
@@ -281,7 +281,7 @@ $config = [
         'factories' => [
             'VuFind\AccountCapabilities' => 'VuFind\Service\Factory::getAccountCapabilities',
             'VuFind\AuthManager' => 'VuFind\Auth\Factory::getManager',
-            'VuFind\AuthPluginManager' => 'VuFind\Service\Factory::getAuthPluginManager',
+            'VuFind\Auth\PluginManager' => 'VuFind\ServiceManager\AbstractPluginManagerFactory',
             'VuFind\AutocompletePluginManager' => 'VuFind\Service\Factory::getAutocompletePluginManager',
             'VuFind\Autocomplete\Suggester' => 'VuFind\Autocomplete\SuggesterFactory',
             'VuFind\CacheManager' => 'VuFind\Service\Factory::getCacheManager',
@@ -358,6 +358,7 @@ $config = [
         'aliases' => [
             'mvctranslator' => 'VuFind\Translator',
             'translator' => 'VuFind\Translator',
+            'VuFind\AuthPluginManager' => 'VuFind\Auth\PluginManager',
             'VuFind\ContentPluginManager' => 'VuFind\Content\PluginManager',
             'VuFind\ContentAuthorNotesPluginManager' => 'VuFind\Content\AuthorNotes\PluginManager',
             'VuFind\ContentCoversPluginManager' => 'VuFind\Content\Covers\PluginManager',
diff --git a/module/VuFind/src/VuFind/Auth/Factory.php b/module/VuFind/src/VuFind/Auth/Factory.php
index 72c27463aaaf97a0321e7613c55ffe35eaa10305..3b0d9709cc9ef5a43bf7898b853e08db34622283 100644
--- a/module/VuFind/src/VuFind/Auth/Factory.php
+++ b/module/VuFind/src/VuFind/Auth/Factory.php
@@ -55,7 +55,7 @@ class Factory
             'ChoiceAuth', $sm->get('VuFind\SessionManager')
         );
         $auth = new ChoiceAuth($container);
-        $auth->setPluginManager($sm->get('VuFind\AuthPluginManager'));
+        $auth->setPluginManager($sm->get('VuFind\Auth\PluginManager'));
         return $auth;
     }
 
@@ -147,7 +147,7 @@ class Factory
         // Load remaining dependencies:
         $userTable = $sm->get('VuFind\DbTablePluginManager')->get('user');
         $sessionManager = $sm->get('VuFind\SessionManager');
-        $pm = $sm->get('VuFind\AuthPluginManager');
+        $pm = $sm->get('VuFind\Auth\PluginManager');
         $cookies = $sm->get('VuFind\CookieManager');
 
         // Build the object and make sure account credentials haven't expired:
@@ -166,7 +166,7 @@ class Factory
     public static function getMultiAuth(ServiceManager $sm)
     {
         $auth = new MultiAuth();
-        $auth->setPluginManager($sm->get('VuFind\AuthPluginManager'));
+        $auth->setPluginManager($sm->get('VuFind\Auth\PluginManager'));
         return $auth;
     }
 
diff --git a/module/VuFind/src/VuFind/Service/Factory.php b/module/VuFind/src/VuFind/Service/Factory.php
index a3ad2816ce208e76c079dc3d4f83fd18999fdc44..06c6c095bc94e53926eeda50710db11662cdc92f 100644
--- a/module/VuFind/src/VuFind/Service/Factory.php
+++ b/module/VuFind/src/VuFind/Service/Factory.php
@@ -57,18 +57,6 @@ class Factory
         );
     }
 
-    /**
-     * Construct the Auth Plugin Manager.
-     *
-     * @param ServiceManager $sm Service manager.
-     *
-     * @return \VuFind\Auth\PluginManager
-     */
-    public static function getAuthPluginManager(ServiceManager $sm)
-    {
-        return static::getGenericPluginManager($sm, 'Auth');
-    }
-
     /**
      * Construct the Autocomplete Plugin Manager.
      *
diff --git a/module/VuFind/src/VuFindTest/Unit/TestCase.php b/module/VuFind/src/VuFindTest/Unit/TestCase.php
index 7f8236cb2f789e1cdd864a7b335fb4d64e039905..1239d20410342097ba13601d25d3abf9e3cc98db 100644
--- a/module/VuFind/src/VuFindTest/Unit/TestCase.php
+++ b/module/VuFind/src/VuFindTest/Unit/TestCase.php
@@ -222,11 +222,11 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
     public function getAuthManager()
     {
         $sm = $this->getServiceManager();
-        if (!$sm->has('VuFind\AuthPluginManager')) {
+        if (!$sm->has('VuFind\Auth\PluginManager')) {
             $authManager = new \VuFind\Auth\PluginManager($sm);
-            $sm->setService('VuFind\AuthPluginManager', $authManager);
+            $sm->setService('VuFind\Auth\PluginManager', $authManager);
         }
-        return $sm->get('VuFind\AuthPluginManager');
+        return $sm->get('VuFind\Auth\PluginManager');
     }
 
     /**