diff --git a/test/phpunit/RestAPIContactTest.php b/test/phpunit/RestAPIContactTest.php
index 93148e804ab..ccc3aad1ebb 100644
--- a/test/phpunit/RestAPIContactTest.php
+++ b/test/phpunit/RestAPIContactTest.php
@@ -137,7 +137,7 @@ class RestAPIContactTest extends PHPUnit\Framework\TestCase
 		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must not be null");
-		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']['code'])) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 		$this->assertEquals('200', $object['success']['code']);
 
 		$this->api_key = $object['success']['token'];
@@ -218,7 +218,7 @@ class RestAPIContactTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result['curl_error_no'], '');
 		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
 		$this->assertNotNull($object, "Parsing of json result must no be null");
-		$this->assertEquals(400, ((is_scalar($object) || empty($object['error']['code'])) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertEquals(400, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 
 		$idofcontactcreated = (int) $object;
 
@@ -238,7 +238,7 @@ class RestAPIContactTest extends PHPUnit\Framework\TestCase
 
 		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
 		$this->assertNotNull($object, "Parsing of json result must not be null");
-		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']['code'])) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 		$this->assertGreaterThan(0, $object, 'ID return is no > 0');
 
 		return $idofcontactcreated;
diff --git a/test/phpunit/RestAPIDocumentTest.php b/test/phpunit/RestAPIDocumentTest.php
index efeb93964b6..04be9b63b55 100644
--- a/test/phpunit/RestAPIDocumentTest.php
+++ b/test/phpunit/RestAPIDocumentTest.php
@@ -131,7 +131,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
 		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must not be null");
-		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']['code'])) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 		$this->assertEquals('200', $object['success']['code']);
 
 		$this->api_key = $object['success']['token'];
@@ -189,7 +189,7 @@ class RestAPIDocumentTest extends PHPUnit\Framework\TestCase
 		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, 'Parsing of json result must not be null');
 		$this->assertEquals('401', $result['http_code'], 'Return code is not 401');
-		$this->assertEquals('401', ((is_scalar($object) || empty($object['error']['code'])) ? '' : $object['error']['code']), 'Error code is not 401');
+		$this->assertEquals('401', (empty($object['error']['code']) ? '' : $object['error']['code']), 'Error code is not 401');
 
 
 		// Send to existent directory
diff --git a/test/phpunit/RestAPIUserTest.php b/test/phpunit/RestAPIUserTest.php
index abaedcbf76b..f9de4f95c9c 100644
--- a/test/phpunit/RestAPIUserTest.php
+++ b/test/phpunit/RestAPIUserTest.php
@@ -137,7 +137,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must not be null");
-		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']['code'])) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 		$this->assertEquals('200', $object['success']['code']);
 
 		$this->api_key = $object['success']['token'];
@@ -175,7 +175,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result['curl_error_no'], '');
 		$object=json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
-		$this->assertEquals(404, $object['error']['code'], 'Error code is not 404');
+		$this->assertEquals(404, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error code is not 404');
 
 		$url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
@@ -219,7 +219,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result['curl_error_no'], '');
 		$object=json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must no be null");
-		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 
 		// create regular user
 		unset($result);
@@ -238,7 +238,7 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must no be null");
-		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']) || empty($object['error']['code'])) ? 0 : $object['error']['code']), 'Error '.(empty($object['error']['message']) ? '' : $object['error']['message']));
+		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']) || empty($object['error']['code'])) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 		$this->assertGreaterThan(0, $object, 'ID returned is no > 0');
 
 		// attempt to create duplicated user
@@ -249,6 +249,6 @@ class RestAPIUserTest extends PHPUnit\Framework\TestCase
 		$this->assertEquals($result['curl_error_no'], '');
 		$object=json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must no be null");
-		$this->assertEquals(500, ((is_scalar($object) || empty($object['error']) || empty($object['error']['code'])) ? 0 : $object['error']['code']), (string) $object['error']['message']);
+		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 	}
 }