diff --git a/test/phpunit/ExportTest.php b/test/phpunit/ExportTest.php
index cf2f0520908..0a0a1c867ba 100644
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@@ -149,6 +149,94 @@ class ExportTest extends PHPUnit\Framework\TestCase
 		print __METHOD__."\n";
 	}
 
+	/**
+	 * Other tests
+	 *
+	 * @return void
+	 */
+	public function testExportCsvUtf()
+	{
+		global $conf,$user,$langs,$db;
+
+		$model='csvutf8';
+
+		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
+
+		// Creation of class to export using model ExportXXX
+		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$file = "export_".$model.".modules.php";
+		$classname = "Export".$model;
+		require_once $dir.$file;
+		$objmodel = new $classname($db);
+
+		// First test without option USE_STRICT_CSV_RULES
+		unset($conf->global->USE_STRICT_CSV_RULES);
+
+		$valtotest='A simple string';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'A simple string');
+
+		$valtotest='A string with , and ; inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
+
+		$valtotest='A string with " inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with "" inside"');
+
+		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
+
+		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
+
+		// Same tests with strict mode
+		$conf->global->USE_STRICT_CSV_RULES = 1;
+
+		$valtotest='A simple string';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'A simple string');
+
+		$valtotest='A string with , and ; inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with , and ; inside"');
+
+		$valtotest='A string with " inside';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with "" inside"');
+
+		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
+
+		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		print __METHOD__." valtotest=".$valtotest."\n";
+		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, '"A string with <a href=""aaa""><strong>html<br>content</strong></a> inside"');
+	}
+
 
 	/**
 	 * Other tests
@@ -159,7 +247,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 
-		$model='csv';
+		$model='csviso';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
 		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.$conf->global->EXPORT_CSV_SEPARATOR_TO_USE;
@@ -263,7 +351,15 @@ class ExportTest extends PHPUnit\Framework\TestCase
 
 		dol_mkdir($conf->export->dir_temp);
 
-		$model='csv';
+		$model='csviso';
+
+		// Build export file
+		print "Process build_file for model = ".$model."\n";
+		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$expectedresult = 1;
+		$this->assertEquals($expectedresult, $result, 'Error in CSV export');
+
+		$model='csvutf8';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
@@ -353,7 +449,7 @@ class ExportTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 
-		$model='csv';
+		$model='csviso';
 
 		$filterdatatoexport='';
 		//$filterdatatoexport='';