diff --git a/config/authentication.ini b/config/authentication.ini
index cddb5697e..e07116ca7 100644
--- a/config/authentication.ini
+++ b/config/authentication.ini
@@ -1,13 +1,4 @@
 [users]
-backend=Db
-dbtype=mysql
-table=account
-host=localhost
-password=icinga
-user=icingaweb
-db=icingaweb
-
-[users-ldap]
 backend=ldap
 hostname=localhost
 root_dn="ou=people,dc=icinga,dc=org"
@@ -16,6 +7,15 @@ bind_pw=admin
 user_class=inetOrgPerson
 user_name_attribute=uid
 
+[users-mysql]
+backend=Db
+dbtype=mysql
+table=account
+host=localhost
+password=icinga
+user=icingaweb
+db=icingaweb
+
 [users-pgsql]
 backend=Db
 dbtype=pgsql
diff --git a/test/php/library/Icinga/Authentication/DbUserBackendTest.php b/test/php/library/Icinga/Authentication/DbUserBackendTest.php
index 8f9dc766f..55a42039b 100644
--- a/test/php/library/Icinga/Authentication/DbUserBackendTest.php
+++ b/test/php/library/Icinga/Authentication/DbUserBackendTest.php
@@ -55,13 +55,24 @@ use Icinga\Application\Config;
  */
 class DbUserBackendTest  extends \PHPUnit_Framework_TestCase {
 
-    private $dbUserBackend;
-    private $db;
+    /**
+     * The table that is used to store the authentication data
+     *
+     * @var string
+     */
     private $testTable = 'account';
+
+    /**
+     * The database that is used to store the authentication data
+     *
+     * @var string
+     */
     private $testDatabase = 'icinga_unittest';
 
-    /*
-     * Must be identical with the column names defined in DbUserBackend
+    /**
+     * Mapping of columns
+     *
+     * @var string
      */
     private $USER_NAME_COLUMN   = 'user_name',
             $FIRST_NAME_COLUMN  = 'first_name',
@@ -73,10 +84,33 @@ class DbUserBackendTest  extends \PHPUnit_Framework_TestCase {
             $DOMAIN_COLUMN      = 'domain',
             $EMAIL_COLUMN       = 'email';
 
+    /**
+     * Example users
+     *
+     * @var array
+     */
     private $users;
+
+    /**
+     * The DbUserBackend configured to use MySQL
+     *
+     * @var DbUserBackend
+     */
     private $mysql;
+
+
+    /**
+     * The DbUserBackend configured to use PostgreSQL
+     *
+     * @var DbUserBackend
+     */
     private $pgsql;
 
+    /**
+     * Contains the PDO names used for the different SQL databases.
+     *
+     * @var array
+     */
     private $dbTypeMap = Array(
         'mysql' => 'PDO_MYSQL',
         'pgsql' => 'PDO_PGSQL'
@@ -103,6 +137,7 @@ class DbUserBackendTest  extends \PHPUnit_Framework_TestCase {
      * Create a backend with the given database type
      *
      * @param $dbType The database type as a string, like 'mysql' or 'pgsql'.
+     *
      * @return DbUserBackend|null
      */
     private function createBackend($dbType)