diff --git a/Tests/CustomFieldTestHelper.php b/Tests/CustomFieldTestHelper.php
index d17d15944..6c38a447b 100644
--- a/Tests/CustomFieldTestHelper.php
+++ b/Tests/CustomFieldTestHelper.php
@@ -30,8 +30,9 @@ use Symfony\Component\DomCrawler\Crawler;
  *
  * @author Julien Fastré <julien.fastre@champs-libres.coop>
  */
-class CustomFieldTestHelper
+trait CustomFieldTestHelper
 {
+
     /**
      * Prepare a crawler containing the rendering of a customField
      * 
@@ -44,18 +45,20 @@ class CustomFieldTestHelper
      * @param type $locale
      * @return Crawler
      */
-    public static function getCrawlerForField(CustomField $field, KernelTestCase $testCase, KernelInterface $kernel, $locale = 'en')
+    public function getCrawlerForField(CustomField $field, $locale = 'en')
     {
-        //check a kernel is accessible
-        $customFieldsGroup = $testCase->getMock('Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
-        $customFieldsGroup->expects($testCase->once())
-            ->method('getActiveCustomFields')
-            ->will($testCase->returnValue(array($field)));
+        $kernel = static::$kernel;
         
-        $request = $testCase->getMock('Symfony\Component\HttpFoundation\Request');
-        $request->expects($testCase->any())
+        //check a kernel is accessible
+        $customFieldsGroup = $this->createMock('Chill\CustomFieldsBundle\Entity\CustomFieldsGroup');
+        $customFieldsGroup->expects($this->once())
+            ->method('getActiveCustomFields')
+            ->will($this->returnValue(array($field)));
+        
+        $request = $this->createMock('Symfony\Component\HttpFoundation\Request');
+        $request->expects($this->any())
             ->method('getLocale')
-            ->will($testCase->returnValue($locale));
+            ->will($this->returnValue($locale));
 
         $kernel->getContainer()->get('request_stack')->push($request);
         
@@ -79,4 +82,4 @@ class CustomFieldTestHelper
         
         return $crawler;
     }
-}
\ No newline at end of file
+}
diff --git a/Tests/CustomFields/CustomFieldsTextTest.php b/Tests/CustomFields/CustomFieldsTextTest.php
index 00130df80..ad031e4a1 100644
--- a/Tests/CustomFields/CustomFieldsTextTest.php
+++ b/Tests/CustomFields/CustomFieldsTextTest.php
@@ -40,6 +40,8 @@ class CustomFieldsTextTest extends WebTestCase
      */
     private $customFieldProvider;
     
+    use CustomFieldTestHelper;
+    
     public function setUp()
     {
         static::bootKernel();
@@ -67,7 +69,7 @@ class CustomFieldsTextTest extends WebTestCase
             ->setActive(true)
             ->setName(array('en' => 'my label'));
         
-        $crawler = CustomFieldTestHelper::getCrawlerForField($customField, $this, static::$kernel);
+        $crawler = $this->getCrawlerForField($customField);
         
         $this->assertCount(1, $crawler->filter("input[type=text]"));
         $this->assertCount(1, $crawler->filter("label:contains('my label')"));   
@@ -83,7 +85,7 @@ class CustomFieldsTextTest extends WebTestCase
             ->setActive(true)
             ->setName(array('en' => 'my label'));
         
-        $crawler = CustomFieldTestHelper::getCrawlerForField($customField, $this, static::$kernel);
+        $crawler = $this->getCrawlerForField($customField);
         
         $this->assertCount(1, $crawler->filter("textarea"));
         $this->assertCount(1, $crawler->filter("label:contains('my label')"));