diff --git a/test/selenium/Helper.php b/test/selenium/Helper.php
index 88bcbff014..eede4eee7b 100644
--- a/test/selenium/Helper.php
+++ b/test/selenium/Helper.php
@@ -173,7 +173,7 @@ class Helper
                 'MySQL not connected'
             );
         }
-        $this->_mysqli->query($query);
+        return $this->_mysqli->query($query);
     }
 
     /**
@@ -258,5 +258,18 @@ class Helper
 
         return $element->text();
     }
+
+    public function typeInTextArea($text)
+    {
+        $text = str_replace(
+            "(",
+            PHPUnit_Extensions_Selenium2TestCase_Keys::SHIFT
+            . PHPUnit_Extensions_Selenium2TestCase_Keys::NUMPAD9
+            . PHPUnit_Extensions_Selenium2TestCase_Keys::NULL,
+            $text
+        );
+        $this->_selenium->byClassName("CodeMirror-scroll")->click();
+        $this->_selenium->keys($text);
+    }
 }
 ?>
diff --git a/test/selenium/PmaSeleniumDbStoredProceduresTest.php b/test/selenium/PmaSeleniumDbStoredProceduresTest.php
new file mode 100644
index 0000000000..b912059db2
--- /dev/null
+++ b/test/selenium/PmaSeleniumDbStoredProceduresTest.php
@@ -0,0 +1,232 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * Selenium TestCase for table related tests
+ *
+ * @package    PhpMyAdmin-test
+ * @subpackage Selenium
+ */
+require_once 'Helper.php';
+
+/**
+ * PmaSeleniumDbStoredProceduresTest class
+ *
+ * @package    PhpMyAdmin-test
+ * @subpackage Selenium
+ */
+class PmaSeleniumDbStoredProceduresTest extends PHPUnit_Extensions_Selenium2TestCase
+{
+    /**
+     * Name of database for the test
+     *
+     * @var string
+     */
+    private $_dbname;
+
+    /**
+     * Helper Object
+     *
+     * @var obj
+     */
+    private $_helper;
+
+    /**
+     * Setup the browser environment to run the selenium test case
+     *
+     * @return void
+     */
+    public function setUp()
+    {
+        $this->_helper = new Helper($this);
+        $this->setBrowser($this->_helper->getBrowserString());
+        $this->setBrowserUrl(TESTSUITE_PHPMYADMIN_HOST . TESTSUITE_PHPMYADMIN_URL);
+        $this->_helper->dbConnect();
+        $this->_dbname = 'pma_db_test';
+        $this->_helper->dbQuery('CREATE DATABASE ' . $this->_dbname);
+        $this->_helper->dbQuery('USE ' . $this->_dbname);
+        $this->_helper->dbQuery(
+            "CREATE TABLE `test_table` ("
+            . " `id` int(11) NOT NULL AUTO_INCREMENT,"
+            . " `name` varchar(20) NOT NULL,"
+            . " `datetimefield` datetime NOT NULL,"
+            . " PRIMARY KEY (`id`)"
+            . ")"
+        );
+        
+    }
+
+    /**
+     * setUp function that can use the selenium session (called before each test)
+     * 
+     * @return void
+     */
+    public function setUpPage()
+    {
+        $this->_helper->login(TESTSUITE_USER, TESTSUITE_PASSWORD);
+        $this->byLinkText($this->_dbname)->click();
+    }
+
+    /**
+     * Creates procedure for tests
+     * 
+     * @return void
+     */
+    private function _procedureSQL()
+    {
+        $this->_helper->dbQuery(
+            "CREATE PROCEDURE `test_procedure`(IN `inp` VARCHAR(10), OUT `outp` INT)"
+            . " NOT DETERMINISTIC READS SQL DATA SQL SECURITY DEFINER SELECT char_"
+            . "length(inp) + count(*) FROM test_table INTO outp"
+        );
+    }
+
+    /**
+     * Create a procedure
+     *
+     * @return void
+     */
+    public function testAddProcedure()
+    {
+        $more = $this->_helper->waitForElement("byLinkText", "More");
+        $this->moveto($more);
+        $ele = $this->_helper->waitForElement("byPartialLinkText", "Routines");
+        $ele->click();
+        
+        $ele = $this->_helper->waitForElement("byLinkText", "Add routine");
+        $ele->click();
+
+        $this->_helper->waitForElement("byClassName", "rte_form");
+
+        $this->byName("item_name")->value("test_procedure");
+        
+        $this->byName("item_param_name[0]")->value("inp");
+        $this->select(
+            $this->byName("item_param_type[0]")
+            )->selectOptionByLabel("VARCHAR");
+        $this->byName("item_param_length[0]")->value("10");
+
+        $this->byCssSelector("input[value='Add parameter']")->click();
+
+        $this->select(
+            $this->byName("item_param_dir[1]")
+            )->selectOptionByLabel("OUT");
+        $ele = $this->_helper->waitForElement("byName", "item_param_name[1]");
+        $ele->value("outp");
+
+        $proc = "SELECT char_length(inp) + count(*) FROM test_table INTO outp";
+        $this->_helper->typeInTextArea($proc);
+
+        $this->select(
+            $this->byName("item_sqldataaccess")
+            )->selectOptionByLabel("READS SQL DATA");
+
+        $this->byCssSelector("div.ui-dialog-buttonset button:nth-child(1)")->click();
+
+        $ele = $this->_helper->waitForElement(
+            "byCssSelector", "div#result_query div.success"
+        );
+
+        $this->assertContains(
+            "Routine `test_procedure` has been created",
+            $ele->text()
+        );
+
+        
+        $result = $this->_helper->dbQuery(
+            "SHOW PROCEDURE STATUS WHERE Db='" . $this->_dbname . "'"
+        );
+
+        $this->assertEquals(1, $result->num_rows);
+        $this->_executeProcedure("abcabcabcabcabcabcabc", 10);
+    }
+
+    /**
+     * Test for editing procedure
+     * 
+     * @return void
+     */
+    public function testEditProcedure()
+    {
+        $this->_procedureSQL();
+        $more = $this->_helper->waitForElement("byLinkText", "More");
+        $this->moveto($more);
+        $ele = $this->_helper->waitForElement("byPartialLinkText", "Routines");
+        $ele->click();
+
+        $this->_helper->waitForElement(
+            "byXPath",
+            "//legend[contains(., 'Routines')]"
+        );
+
+        $this->byLinkText("Edit")->click();
+        $this->_helper->waitForElement("byClassName", "rte_form");
+        $this->byName("item_param_length[0]")->clear();
+        $this->byName("item_param_length[0]")->value("12");
+
+        $this->byCssSelector("div.ui-dialog-buttonset button:nth-child(1)")->click();
+
+        $ele = $this->_helper->waitForElement(
+            "byCssSelector", "div#result_query div.success"
+        );
+
+        $this->assertContains(
+            "Routine `test_procedure` has been modified",
+            $ele->text()
+        );
+
+        $this->_executeProcedure("abcabcabcabcabcabcabc", 12);
+    }
+
+    /**
+     * Test for dropping procedure
+     * 
+     * @return void
+     */
+    public function testDropProcedure()
+    {
+        $this->_procedureSQL();
+        $more = $this->_helper->waitForElement("byLinkText", "More");
+        $this->moveto($more);
+        $ele = $this->_helper->waitForElement("byPartialLinkText", "Routines");
+        $ele->click();
+
+        $this->_helper->waitForElement(
+            "byXPath",
+            "//legend[contains(., 'Routines')]"
+        );
+
+        $this->byLinkText("Drop")->click();
+        $this->byCssSelector("div.ui-dialog-buttonset button:nth-child(1)")->click();
+
+        $this->_helper->waitForElement("byId", "nothing2display");
+    }
+
+    /**
+     * Execute procedure
+     * 
+     * @return void
+     */
+    private function _executeProcedure($text, $length)
+    {
+        $this->_helper->waitForElement("byLinkText", "Execute")->click();
+        $this->_helper->waitForElement("byName", "params[inp]")->value($text);
+        $this->byCssSelector("div.ui-dialog-buttonset button:nth-child(1)")->click();
+        $this->_helper->waitForElement(
+            "byCssSelector",
+            "span#PMA_slidingMessage table tbody"
+        );
+        $head = $this->byCssSelector("span#PMA_slidingMessage table tbody")->text();
+        $this->assertEquals("outp\n$length", $head);
+    }
+
+    /**
+     * Tear Down function for test cases
+     * 
+     * @return void
+     */
+    public function tearDown()
+    {
+        $this->_helper->dbQuery('DROP DATABASE ' . $this->_dbname);
+    }
+}
+    
\ No newline at end of file