diff --git a/test/libraries/PMA_server_binlong_test.php b/test/libraries/PMA_server_binlong_test.php
new file mode 100644
index 0000000000..cf44703745
--- /dev/null
+++ b/test/libraries/PMA_server_binlong_test.php
@@ -0,0 +1,61 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for server_bin_log.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/server_bin_log.lib.php';
+require_once 'libraries/Theme.class.php';
+
+class PMA_ServerBinlog_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $_REQUEST['log'] = "index1";
+        $GLOBALS['cfg']['MaxRows'] = 10;
+        $GLOBALS['cfg']['ServerDefault'] = "server";
+    }
+
+    /**
+     * Test for PMA_getLogSelector
+     *
+     * @return void
+     */
+    public function testPMA_getLogSelector()
+    {
+        $binary_log_file_names = array();
+        $binary_log_file_names[] = array("Log_name"=>"index1", "File_size"=>100);
+        $binary_log_file_names[] = array("Log_name"=>"index2", "File_size"=>200);
+        
+        $url_params = array();
+        $url_params['log'] = "log";
+        $url_params['dontlimitchars'] = 1;
+
+        $html = PMA_getLogSelector($binary_log_file_names, $url_params);
+        $this->assertContains(
+            'Select binary log to view',
+            $html
+        );
+        $this->assertContains(
+            '<option value="index1" selected="selected">index1 (100 B)</option>',
+            $html
+        );
+        $this->assertContains(
+            '<option value="index2">index2 (200 B)</option>',
+            $html
+        );
+    }
+}
diff --git a/test/libraries/PMA_server_common_test.php b/test/libraries/PMA_server_common_test.php
new file mode 100644
index 0000000000..c12e383120
--- /dev/null
+++ b/test/libraries/PMA_server_common_test.php
@@ -0,0 +1,71 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for server_common.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/server_common.lib.php';
+require_once 'libraries/Theme.class.php';
+
+class PMA_ServerCommon_Test extends PHPUnit_Framework_TestCase
+{
+    /**
+     * Prepares environment for the test.
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+    }
+
+    /**
+     * Test for PMA_getSubPageHeader
+     *
+     * @return void
+     */
+    public function testPMA_getSubPageHeader()
+    {
+    	//server_engines
+    	$html = PMA_getSubPageHeader("engines");
+        $this->assertContains(
+            '<img src="themes/dot.gif" title="" alt="" class="icon ic_b_engine" />',
+        	$html
+        ); 
+        $this->assertContains(
+            'Storage Engines',
+        	$html
+        );
+        
+    	//server_databases
+    	$html = PMA_getSubPageHeader("databases");
+        $this->assertContains(
+            '<img src="themes/dot.gif" title="" alt="" class="icon ic_s_db" />',
+        	$html
+        ); 
+        $this->assertContains(
+            'Databases',
+        	$html
+        );
+        
+    	//server_replication
+    	$html = PMA_getSubPageHeader("replication");
+        $this->assertContains(
+            '<img src="themes/dot.gif" title="" alt="" class="icon ic_s_replication" />',
+        	$html
+        ); 
+        $this->assertContains(
+            'Replication',
+        	$html
+        );
+    }
+
+}