diff --git a/libraries/classes/Server/Users.php b/libraries/classes/Server/Users.php
new file mode 100644
index 0000000000..6e8231dc42
--- /dev/null
+++ b/libraries/classes/Server/Users.php
@@ -0,0 +1,62 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * set of common functions for sub tabs in server level `Users` page
+ *
+ * @package PhpMyAdmin
+ */
+namespace PhpMyAdmin\Server;
+
+use PhpMyAdmin\Url;
+
+/**
+ * PhpMyAdmin\Server\Users class
+ *
+ * @package PhpMyAdmin
+ */
+class Users
+{
+    /**
+     * Get HTML for secondary level menu tabs on 'Users' page
+     *
+     * @param string $selfUrl Url of the file
+     *
+     * @return string HTML for secondary level menu tabs on 'Users' page
+     */
+    public static function getHtmlForSubMenusOnUsersPage($selfUrl)
+    {
+        $items = array(
+            array(
+                'name' => __('User accounts overview'),
+                'url' => 'server_privileges.php',
+                'params' => Url::getCommon(array('viewing_mode' => 'server')),
+            )
+        );
+
+        if ($GLOBALS['is_superuser']) {
+            $items[] = array(
+                'name' => __('User groups'),
+                'url' => 'server_user_groups.php',
+                'params' => Url::getCommon(),
+            );
+        }
+
+        $retval  = '<ul id="topmenu2">';
+        foreach ($items as $item) {
+            $class = '';
+            if ($item['url'] === $selfUrl) {
+                $class = ' class="tabactive"';
+            }
+            $retval .= '<li>';
+            $retval .= '<a' . $class;
+            $retval .= ' href="' . $item['url'] . $item['params'] . '">';
+            $retval .= $item['name'];
+            $retval .= '</a>';
+            $retval .= '</li>';
+        }
+        $retval .= '</ul>';
+        $retval .= '<div class="clearfloat"></div>';
+
+        return $retval;
+    }
+}
diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php
deleted file mode 100644
index e4dba4ea84..0000000000
--- a/libraries/server_users.lib.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * set of common functions for sub tabs in server level `Users` page
- *
- * @package PhpMyAdmin
- */
-use PhpMyAdmin\Url;
-
-/**
- * Get HTML for secondary level menu tabs on 'Users' page
- *
- * @param string $selfUrl Url of the file
- *
- * @return string HTML for secondary level menu tabs on 'Users' page
- */
-function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
-{
-    $items = array(
-        array(
-            'name' => __('User accounts overview'),
-            'url' => 'server_privileges.php',
-            'params' => Url::getCommon(array('viewing_mode' => 'server')),
-        )
-    );
-
-    if ($GLOBALS['is_superuser']) {
-        $items[] = array(
-            'name' => __('User groups'),
-            'url' => 'server_user_groups.php',
-            'params' => Url::getCommon(),
-        );
-    }
-
-    $retval  = '<ul id="topmenu2">';
-    foreach ($items as $item) {
-        $class = '';
-        if ($item['url'] === $selfUrl) {
-            $class = ' class="tabactive"';
-        }
-        $retval .= '<li>';
-        $retval .= '<a' . $class;
-        $retval .= ' href="' . $item['url'] . $item['params'] . '">';
-        $retval .= $item['name'];
-        $retval .= '</a>';
-        $retval .= '</li>';
-    }
-    $retval .= '</ul>';
-    $retval .= '<div class="clearfloat"></div>';
-
-    return $retval;
-}
diff --git a/server_privileges.php b/server_privileges.php
index a3144f7ab7..2d195d1809 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -11,6 +11,7 @@ use PhpMyAdmin\Message;
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
 use PhpMyAdmin\Server\Privileges;
+use PhpMyAdmin\Server\Users;
 
 /**
  * include common file
@@ -37,9 +38,8 @@ if ((isset($_REQUEST['viewing_mode'])
     && $_REQUEST['viewing_mode'] == 'server')
     && $GLOBALS['cfgRelation']['menuswork']
 ) {
-    include_once 'libraries/server_users.lib.php';
     $response->addHTML('<div>');
-    $response->addHTML(PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php'));
+    $response->addHTML(Users::getHtmlForSubMenusOnUsersPage('server_privileges.php'));
 }
 
 /**
diff --git a/server_user_groups.php b/server_user_groups.php
index 4f669ca5e9..044fe5b525 100644
--- a/server_user_groups.php
+++ b/server_user_groups.php
@@ -7,9 +7,9 @@
  */
 use PhpMyAdmin\Relation;
 use PhpMyAdmin\Response;
+use PhpMyAdmin\Server\Users;
 
 require_once 'libraries/common.inc.php';
-require_once 'libraries/server_users.lib.php';
 require_once 'libraries/server_user_groups.lib.php';
 
 Relation::getRelationsParam();
@@ -34,7 +34,7 @@ if (! $GLOBALS['is_superuser']) {
 }
 
 $response->addHTML('<div>');
-$response->addHTML(PMA_getHtmlForSubMenusOnUsersPage('server_user_groups.php'));
+$response->addHTML(Users::getHtmlForSubMenusOnUsersPage('server_user_groups.php'));
 
 /**
  * Delete user group
diff --git a/test/libraries/PMA_server_users_test.php b/test/classes/Server/UsersTest.php
similarity index 65%
rename from test/libraries/PMA_server_users_test.php
rename to test/classes/Server/UsersTest.php
index d5d7f21faf..d220992474 100644
--- a/test/libraries/PMA_server_users_test.php
+++ b/test/classes/Server/UsersTest.php
@@ -1,33 +1,31 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * Tests for server_users.lib.php
+ * Tests for PhpMyAdmin\Server\Users
  *
  * @package PhpMyAdmin-test
  */
+namespace PhpMyAdmin\Tests\Server;
 
-/*
- * Include to test.
- */
-require_once 'libraries/server_users.lib.php';
+use PhpMyAdmin\Server\Users;
 
 /**
- * PMA_ServerUsers_Test class
+ * PhpMyAdmin\Tests\Server\UsersTest class
  *
- * This class is for testing server_users.lib.php functions
+ * This class is for testing PhpMyAdmin\Server\Users methods
  *
  * @package PhpMyAdmin-test
  */
-class PMA_ServerUsers_Test extends PHPUnit_Framework_TestCase
+class UsersTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Test for PMA_getHtmlForSubMenusOnUsersPage
+     * Test for Users::getHtmlForSubMenusOnUsersPage
      *
      * @return void
      */
-    public function testPMAGetHtmlForSubMenusOnUsersPage()
+    public function testGetHtmlForSubMenusOnUsersPage()
     {
-        $html = PMA_getHtmlForSubMenusOnUsersPage('server_privileges.php');
+        $html = Users::getHtmlForSubMenusOnUsersPage('server_privileges.php');
 
         //validate 1: topmenu2
         $this->assertContains(