diff --git a/library/Icinga/Test/BaseTestCase.php b/library/Icinga/Test/BaseTestCase.php
index 1c72b0f47..f836e2725 100644
--- a/library/Icinga/Test/BaseTestCase.php
+++ b/library/Icinga/Test/BaseTestCase.php
@@ -25,20 +25,16 @@ namespace Icinga\Test {
     use RuntimeException;
     use Mockery;
     use Zend_Config;
-    use Zend_Controller_Request_Abstract;
-    use Zend_Controller_Request_HttpTestCase;
     use PHPUnit_Framework_TestCase;
     use Icinga\Application\Icinga;
     use Icinga\Util\DateTimeFactory;
     use Icinga\Data\ResourceFactory;
     use Icinga\Data\Db\DbConnection;
-    use Icinga\User\Preferences;
-    use Icinga\Web\Form;
 
     /**
      * Class BaseTestCase
      */
-    class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest, FormTest
+    class BaseTestCase extends PHPUnit_Framework_TestCase implements DbTest
     {
         /**
          * Path to application/
@@ -82,13 +78,6 @@ namespace Icinga\Test {
          */
         public static $moduleDir;
 
-        /**
-         * Store request for form tests
-         * 
-         * @var Zend_Controller_Request_HttpTestCase
-         */
-        private $request;
-
         /**
          * Resource configuration for different database types
          *
@@ -319,51 +308,6 @@ namespace Icinga\Test {
                 $adapter->exec('DROP TABLE ' . $table . ';');
             }
         }
-
-        /**
-         * Instantiate a form
-         *
-         * If the form has CSRF protection enabled, creates the form's token element and adds the generated token to the
-         * request data
-         *
-         * @param   string  $formClass      Qualified class name of the form to create. Note that the class has to be
-         *                                  defined as no attempt is made to require the class before instantiating.
-         * @param   array   $requestData    Request data for the form
-         *
-         * @return  Form
-         * @throws  RuntimeException
-         */
-        public function createForm($formClass, array $requestData = array())
-        {
-            $form = new $formClass;
-            $form->setTokenDisabled(); // Disable CSRF protection else all calls to isSubmittedAndValid will fail
-            $request = $this->getRequest();
-            $request->setMethod('POST');
-            $request->setPost($requestData);
-            $form->setRequest($request);
-            $form->setUserPreferences(
-                new Preferences(
-                    array()
-                )
-            );
-            return $form;
-        }
-
-        /**
-         * Retrieve test case request object
-         *
-         * This is a mock methods borrowed from Zend Controller Test Case to handle form tests properly (#6106)
-         *
-         * @return Zend_Controller_Request_HttpTestCase
-         */
-        public function getRequest()
-        {
-            if (null === $this->request) {
-                require_once 'Zend/Controller/Request/HttpTestCase.php';
-                $this->request = new Zend_Controller_Request_HttpTestCase;
-            }
-            return $this->request;
-        }
     }
 
     BaseTestCase::setupTimezone();
diff --git a/library/Icinga/Test/FormTest.php b/library/Icinga/Test/FormTest.php
deleted file mode 100644
index e8b070483..000000000
--- a/library/Icinga/Test/FormTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// {{{ICINGA_LICENSE_HEADER}}}
-// {{{ICINGA_LICENSE_HEADER}}}
-
-namespace Icinga\Test;
-
-use Icinga\Web\Form;
-
-/**
- * Interface to test form objects
- */
-interface FormTest
-{
-    /**
-     * Instantiate a new form object
-     *
-     * @param   string    $formClass      Form class to instantiate
-     * @param   array     $requestData    Request data for the form
-     *
-     * @return Form
-     */
-    public function createForm($formClass, array $requestData = array());
-}