diff --git a/tests/functional/CurrencyControllerCest.php b/tests/functional/CurrencyControllerCest.php
index 78798ab407..0f59b4136f 100644
--- a/tests/functional/CurrencyControllerCest.php
+++ b/tests/functional/CurrencyControllerCest.php
@@ -1,6 +1,10 @@
 <?php
 
 /**
+ *
+ * @SuppressWarnings("CamelCase")
+ * @SuppressWarnings("short")
+ *
  * Class CurrencyControllerCest
  */
 class CurrencyControllerCest
@@ -53,6 +57,9 @@ class CurrencyControllerCest
         $I->see('Currency &quot;US Dollar&quot; deleted');
     }
 
+    /**
+     * @param FunctionalTester $I
+     */
     public function defaultCurrency(FunctionalTester $I)
     {
         $I->wantTo('make US Dollar the default currency');
diff --git a/tests/functional/HomeControllerCest.php b/tests/functional/HomeControllerCest.php
index d6385df4ad..c48de4a0e4 100644
--- a/tests/functional/HomeControllerCest.php
+++ b/tests/functional/HomeControllerCest.php
@@ -1,6 +1,9 @@
 <?php
 
 /**
+ *
+ * @SuppressWarnings("CamelCase")
+ * @SuppressWarnings("short")
  * Class HomeControllerCest
  */
 class HomeControllerCest
diff --git a/tests/functional/JsonControllerCest.php b/tests/functional/JsonControllerCest.php
index 0f76e1fdd7..6aee764604 100644
--- a/tests/functional/JsonControllerCest.php
+++ b/tests/functional/JsonControllerCest.php
@@ -1,12 +1,10 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: sander
- * Date: 21/12/14
- * Time: 18:05
- */
 
 /**
+ *
+ * @SuppressWarnings("CamelCase")
+ * @SuppressWarnings("short")
+ *
  * Class JsonControllerCest
  */
 class JsonControllerCest
diff --git a/tests/functional/PiggyBankControllerCest.php b/tests/functional/PiggyBankControllerCest.php
index 38932d55ba..136eb6cbd7 100644
--- a/tests/functional/PiggyBankControllerCest.php
+++ b/tests/functional/PiggyBankControllerCest.php
@@ -1,6 +1,10 @@
 <?php
 
 /**
+ *
+ * @SuppressWarnings("CamelCase")
+ * @SuppressWarnings("short")
+ *
  * Class PiggybankControllerCest
  */
 class PiggyBankControllerCest