diff --git a/core/trunk/core/tests/class/ViewController.php b/core/trunk/core/tests/class/ViewController.php
index 1fc5352dea59f602d4b5f8e66ccfd9c953721cb4..7d99d345e11967c26d8ab4b37a868f5c90470769 100644
--- a/core/trunk/core/tests/class/ViewController.php
+++ b/core/trunk/core/tests/class/ViewController.php
@@ -360,6 +360,9 @@ class ViewController
         $viewElement,
         $value
     ) {
+        // Replace CR/LF by <br/>
+        $value = preg_replace("/(\r\n|\n|&#xD;)/", '<br/>', $value);
+        
         switch($viewElement->tagName) {
         case 'input':
             switch($viewElement->getAttribute('type')) {