diff --git a/module/Organizations/test/OrganizationsTest/Form/OrganizationContactFieldsetTest.php b/module/Organizations/test/OrganizationsTest/Form/OrganizationContactFieldsetTest.php
index c5840e14c..007800f20 100644
--- a/module/Organizations/test/OrganizationsTest/Form/OrganizationContactFieldsetTest.php
+++ b/module/Organizations/test/OrganizationsTest/Form/OrganizationContactFieldsetTest.php
@@ -6,7 +6,7 @@
  * @license MIT
  * @copyright  2013 - 2016 Cross Solution <http://cross-solution.de>
  */
-  
+
 /** */
 namespace OrganizationsTest\Form;
 
@@ -61,7 +61,52 @@ public function testAllowObjectBinding()
 
     public function testGetInputFilterSpec()
     {
-        $this->assertSame($this->target->getInputFilterSpecification(), []);
+        $spec = [
+            'street' => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+            'houseNumber'  => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+            'postalcode' => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+            'city' => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+            'country' => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+            'phone' => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+            'fax' => [
+                'required' => false,
+                'filters' => [
+                    ['name' => 'StripTags']
+                ],
+            ],
+        ];
+
+        $this->assertSame($this->target->getInputFilterSpecification(), $spec);
     }
 
     public function testGetHydrator()
diff --git a/module/Organizations/test/OrganizationsTest/Form/OrganizationDescriptionFieldsetTest.php b/module/Organizations/test/OrganizationsTest/Form/OrganizationDescriptionFieldsetTest.php
index fe73ed207..4e65dd89c 100644
--- a/module/Organizations/test/OrganizationsTest/Form/OrganizationDescriptionFieldsetTest.php
+++ b/module/Organizations/test/OrganizationsTest/Form/OrganizationDescriptionFieldsetTest.php
@@ -6,7 +6,7 @@
  * @license MIT
  * @copyright  2013 - 2016 Cross Solution <http://cross-solution.de>
  */
-  
+
 /** */
 namespace OrganizationsTest\Form;
 
@@ -50,7 +50,16 @@ public function testNameFormFields()
 
     public function testGetInputFilterSpec()
     {
-        $this->assertSame($this->target->getInputFilterSpecification(), []);
+        $spec = [
+            'description' => [
+                'required' => true,
+                'allow_empty' => true,
+                'filters' => [
+                    ['name' => 'StripTags'],
+                ],
+            ],
+        ];
+        $this->assertSame($this->target->getInputFilterSpecification(), $spec);
     }
 
     public function testGetHydrator()