diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php
index 17ed188dbf..18676bf42a 100644
--- a/libraries/ServerStatusData.class.php
+++ b/libraries/ServerStatusData.class.php
@@ -6,8 +6,10 @@
  *
  * @package PhpMyAdmin
  */
-
-require_once 'libraries/common.inc.php';
+if (!defined('TESTSUITE')) {
+    //the TESTSUITE has already included common.inc.php
+    require_once 'libraries/common.inc.php';
+}
 
 /**
  * This class provides data about the server status
diff --git a/test/libraries/PMA_server_binlog_test.php b/test/libraries/PMA_server_binlog_test.php
index 478fef3bbd..568c8ce600 100644
--- a/test/libraries/PMA_server_binlog_test.php
+++ b/test/libraries/PMA_server_binlog_test.php
@@ -20,6 +20,13 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * PMA_ServerBinlog_Test class
+ *
+ * this class is for testing server_bin_log.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_collations_test.php b/test/libraries/PMA_server_collations_test.php
index aad4eccb39..8c94411cb8 100644
--- a/test/libraries/PMA_server_collations_test.php
+++ b/test/libraries/PMA_server_collations_test.php
@@ -39,6 +39,13 @@ require_once 'libraries/server_common.inc.php';
 require_once 'libraries/mysql_charsets.inc.php';
 require_once 'libraries/server_collations.lib.php';
 
+/**
+ * PMA_ServerBinlog_Test class
+ *
+ * this class is for testing server_collations.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerCollations_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_common_test.php b/test/libraries/PMA_server_common_test.php
index ce2c20788a..1c39b31dca 100644
--- a/test/libraries/PMA_server_common_test.php
+++ b/test/libraries/PMA_server_common_test.php
@@ -15,6 +15,13 @@ require_once 'libraries/url_generating.lib.php';
 require_once 'libraries/server_common.lib.php';
 require_once 'libraries/Theme.class.php';
 
+/**
+ * PMA_ServerCommon_Test class
+ *
+ * this class is for testing server_common.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerCommon_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_engines_test.php b/test/libraries/PMA_server_engines_test.php
index 50702d585f..9943969962 100644
--- a/test/libraries/PMA_server_engines_test.php
+++ b/test/libraries/PMA_server_engines_test.php
@@ -22,6 +22,13 @@ require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 require_once 'libraries/StorageEngine.class.php';
 
+/**
+ * PMA_ServerEngines_Test class
+ *
+ * this class is for testing server_engines.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerEngines_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_plugins_test.php b/test/libraries/PMA_server_plugins_test.php
index 2a35513118..195af93624 100644
--- a/test/libraries/PMA_server_plugins_test.php
+++ b/test/libraries/PMA_server_plugins_test.php
@@ -20,6 +20,13 @@ require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/sqlparser.lib.php';
 require_once 'libraries/js_escape.lib.php';
 
+/**
+ * PMA_ServerPlugins_Test class
+ *
+ * this class is for testing server_plugins.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
 class PMA_ServerPlugins_Test extends PHPUnit_Framework_TestCase
 {
     /**
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/libraries/PMA_server_status_monitor_test.php
new file mode 100644
index 0000000000..1edd2f9d3a
--- /dev/null
+++ b/test/libraries/PMA_server_status_monitor_test.php
@@ -0,0 +1,220 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for PMA_server_status_monitor.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/Util.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/ServerStatusData.class.php';
+require_once 'libraries/server_status_monitor.lib.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/database_interface.inc.php';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/sanitizing.lib.php';
+require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/js_escape.lib.php';
+
+/**
+ * class PMA_ServerStatusMonitor_Test
+ *
+ * this class is for testing PMA_server_status_monitor.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public $ServerStatusData;
+
+    /**
+     * Test for setUp
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        //$_REQUEST
+        $_REQUEST['log'] = "index1";
+        $_REQUEST['pos'] = 3;
+        
+        //$GLOBALS
+        $GLOBALS['cfg']['MaxRows'] = 10;
+        $GLOBALS['cfg']['ServerDefault'] = "server";
+        $GLOBALS['cfg']['RememberSorting'] = true;
+        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
+        $GLOBALS['cfg']['ShowSQL'] = true;
+        $GLOBALS['cfg']['SQP']['fmtType'] = 'none';
+        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
+        $GLOBALS['cfg']['LimitChars'] = 100;
+        $GLOBALS['cfg']['DBG']['sql'] = false;
+        $GLOBALS['cfg']['Server']['host'] = "localhost";   
+        $GLOBALS['cfg']['MySQLManualType'] = 'viewable';  
+        $GLOBALS['cfg']['ShowHint'] = true;
+        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
+        $GLOBALS['server_master_status'] = false;
+        $GLOBALS['server_slave_status'] = false;
+        
+        $GLOBALS['table'] = "table";
+        $GLOBALS['pmaThemeImage'] = 'image';
+        
+        //$_SESSION
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+
+        //Mock DBI
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+        
+        //this data is needed when PMA_ServerStatusData constructs
+        $server_status = array(
+            "Aborted_clients" => "0",
+            "Aborted_connects" => "0",
+            "Com_delete_multi" => "0",
+            "Com_create_function" => "0",
+            "Com_empty_query" => "0",
+        );
+        
+        $server_variables= array(
+            "auto_increment_increment" => "1",
+            "auto_increment_offset" => "1",
+            "automatic_sp_privileges" => "ON",
+            "back_log" => "50",
+            "big_tables" => "OFF",
+        );
+        
+        $dbi->expects($this->at(0))->method('fetchResult')
+            ->with('SHOW GLOBAL STATUS', 0, 1)
+            ->will($this->returnValue($server_status));
+        
+        $server_variables = array();
+        $dbi->expects($this->at(1))->method('fetchResult')
+            ->with('SHOW GLOBAL VARIABLES', 0, 1)
+            ->will($this->returnValue($server_variables));
+         
+        $GLOBALS['dbi'] = $dbi;
+        
+        $this->ServerStatusData = new PMA_ServerStatusData();
+    }
+
+    /**
+     * Test for PMA_getHtmlForMonitor
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForMonitor()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForMonitor($this->ServerStatusData);
+
+        //validate 1: PMA_getHtmlForTabLinks
+        $this->assertContains(
+            '<div class="tabLinks">',
+            $html
+        );
+        $this->assertContains(
+            __('Start Monitor'),
+            $html
+        );	
+        $this->assertContains(
+            __('Settings'),
+            $html
+        );		
+        $this->assertContains(
+            __('Done dragging (rearranging) charts'),
+            $html
+        );	
+        //validate 2: PMA_getHtmlForSettingsDialog
+        $this->assertContains(
+            '<div class="popupContent settingsPopup">',
+            $html
+        );  
+        $this->assertContains(
+            '<a href="#settingsPopup" class="popupLink">',
+            $html
+        );   
+        $this->assertContains(
+            __('Enable charts dragging'),
+            $html
+        );   
+        $this->assertContains(
+            '<option>3</option>',
+            $html
+        );      		
+        //validate 3: PMA_getHtmlForInstructionsDialog
+        $this->assertContains(
+            __('Monitor Instructions'),
+            $html
+        ); 
+        $this->assertContains(
+            'Instructions/Setup',
+            $html
+        ); 
+        $this->assertContains(
+            'Settings</a><a href="#monitorInstructionsDialog">',
+            $html
+        );        	
+        //validate 4: PMA_getHtmlForAddChartDialog
+        $this->assertContains(
+            '<div id="addChartDialog"',
+            $html
+        );
+        $this->assertContains(
+            '<div id="chartVariableSettings">',
+            $html
+        );
+        $this->assertContains(
+            '<option>Processes</option>',
+            $html
+        );
+        $this->assertContains(
+            '<option>Connections</option>',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForClientSideDataAndLinks
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForClientSideDataAndLinks()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForClientSideDataAndLinks($this->ServerStatusData);
+
+        //validate 1: PMA_getHtmlForClientSideDataAndLinks
+        $from = '<form id="js_data" class="hide">' 
+            . '<input type="hidden" name="server_time"';
+        $this->assertContains(
+            $from,
+            $html
+        );
+        //validate 2: inputs
+        $this->assertContains(
+            '<input type="hidden" name="is_superuser"',
+            $html
+        );
+        $this->assertContains(
+            '<input type="hidden" name="server_db_isLocal"',
+            $html
+        );
+        $this->assertContains(
+            '<div id="explain_docu" class="hide">',
+            $html
+        );
+    }
+}
+
diff --git a/test/libraries/PMA_server_status_variables_test.php b/test/libraries/PMA_server_status_variables_test.php
new file mode 100644
index 0000000000..64f09a5cd9
--- /dev/null
+++ b/test/libraries/PMA_server_status_variables_test.php
@@ -0,0 +1,235 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for server_status_variables.lib.php
+ *
+ * @package PhpMyAdmin-test
+ */
+
+/*
+ * Include to test.
+ */
+require_once 'libraries/Util.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
+require_once 'libraries/url_generating.lib.php';
+require_once 'libraries/ServerStatusData.class.php';
+require_once 'libraries/server_status_variables.lib.php';
+require_once 'libraries/Theme.class.php';
+require_once 'libraries/database_interface.inc.php';
+require_once 'libraries/Message.class.php';
+require_once 'libraries/sanitizing.lib.php';
+require_once 'libraries/sqlparser.lib.php';
+require_once 'libraries/js_escape.lib.php';
+
+/**
+ * class PMA_ServerStatusVariables_Test
+ *
+ * this class is for testing server_status_variables.lib.php functions
+ *
+ * @package PhpMyAdmin-test
+ */
+class PMA_ServerStatusVariables_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public $ServerStatusData;
+
+    /**
+     * Test for setUp
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        //$_REQUEST
+        $_REQUEST['log'] = "index1";
+        $_REQUEST['pos'] = 3;
+        
+        //$GLOBALS
+        $GLOBALS['cfg']['MaxRows'] = 10;
+        $GLOBALS['cfg']['ServerDefault'] = "server";
+        $GLOBALS['cfg']['RememberSorting'] = true;
+        $GLOBALS['cfg']['SQP'] = array();
+        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'] = 1000;
+        $GLOBALS['cfg']['ShowSQL'] = true;
+        $GLOBALS['cfg']['SQP']['fmtType'] = 'none';
+        $GLOBALS['cfg']['TableNavigationLinksMode'] = 'icons';
+        $GLOBALS['cfg']['LimitChars'] = 100;
+        $GLOBALS['cfg']['DBG']['sql'] = false;
+        $GLOBALS['cfg']['Server']['host'] = "localhost";   
+        $GLOBALS['cfg']['MySQLManualType'] = 'viewable';  
+        $GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
+        $GLOBALS['server_master_status'] = false;
+        $GLOBALS['server_slave_status'] = false;
+        
+        $GLOBALS['table'] = "table";
+        $GLOBALS['pmaThemeImage'] = 'image';
+        
+        //$_SESSION
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $_SESSION['PMA_Theme'] = new PMA_Theme();
+
+        //Mock DBI
+        $dbi = $this->getMockBuilder('PMA_DatabaseInterface')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        //this data is needed when PMA_ServerStatusData constructs
+        $server_status = array(
+            "Aborted_clients" => "0",
+            "Aborted_connects" => "0",
+            "Com_delete_multi" => "0",
+            "Com_create_function" => "0",
+            "Com_empty_query" => "0",
+        );
+        
+        $server_variables= array(
+            "auto_increment_increment" => "1",
+            "auto_increment_offset" => "1",
+            "automatic_sp_privileges" => "ON",
+            "back_log" => "50",
+            "big_tables" => "OFF",
+        );
+        
+        $dbi->expects($this->at(0))->method('fetchResult')
+            ->with('SHOW GLOBAL STATUS', 0, 1)
+            ->will($this->returnValue($server_status));
+        
+        $server_variables = array();
+        $dbi->expects($this->at(1))->method('fetchResult')
+            ->with('SHOW GLOBAL VARIABLES', 0, 1)
+            ->will($this->returnValue($server_variables));
+         
+        $GLOBALS['dbi'] = $dbi;
+        $this->ServerStatusData = new PMA_ServerStatusData();
+    }
+
+    /**
+     * Test for PMA_getHtmlForFilter
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForFilter()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForFilter($this->ServerStatusData);
+
+        //validate 1: PMA_getHtmlForFilter
+        $this->assertContains(
+            '<fieldset id="tableFilter">',
+            $html
+        );
+        $this->assertContains(
+            'server_status_variables.php',
+            $html
+        );
+        //validate 2: filter
+        $this->assertContains(
+            '<label for="filterText">Containing the word:</label>',
+            $html
+        );
+        //validate 3:Items
+        $this->assertContains(
+            '<label for="filterAlert">Show only alert values</label>',
+            $html
+        );
+        $this->assertContains(
+            'Filter by category',
+            $html
+        );
+        $this->assertContains(
+            'Show unformatted values',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForLinkSuggestions
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForLinkSuggestions()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForLinkSuggestions($this->ServerStatusData);
+
+        //validate 1: PMA_getHtmlForLinkSuggestions
+        $this->assertContains(
+            '<div id="linkSuggestions" class="defaultLinks"',
+            $html
+        );
+        //validate 2: linkSuggestions
+        $this->assertContains(
+            '<p class="notice">Related links:',
+            $html
+        );
+        $this->assertContains(
+            'Flush (close) all tables',
+            $html
+        );
+        $this->assertContains(
+            '<span class="status_binlog_cache">',
+            $html
+        );
+    }
+
+    /**
+     * Test for PMA_getHtmlForVariablesList
+     *
+     * @return void
+     */
+    public function testPMAGetHtmlForVariablesList()
+    {
+        //Call the test function          
+        $html = PMA_getHtmlForVariablesList($this->ServerStatusData);
+
+        //validate 1: PMA_getHtmlForVariablesList
+        $table = '<table class="data sortable noclick" ' 
+            . 'id="serverstatusvariables">';
+        $this->assertContains(
+            $table,
+            $html
+        );
+        $this->assertContains(
+            '<th>Variable</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th>Value</th>',
+            $html
+        );
+        $this->assertContains(
+            '<th>Description</th>',
+            $html
+        );
+        //validate 3:Items
+        $this->assertContains(
+            '<th class="name">Aborted clients',
+            $html
+        );
+        $this->assertContains(
+            '<span class="allfine">0</span>',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Aborted connects',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Com delete multi',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Com create function',
+            $html
+        );
+        $this->assertContains(
+            '<th class="name">Com empty query',
+            $html
+        );
+    }
+}
+