diff --git a/e107_tests/tests/unit/e107_user_extendedTest.php b/e107_tests/tests/unit/e107_user_extendedTest.php
index 99d91c06f..1b6a43e12 100644
--- a/e107_tests/tests/unit/e107_user_extendedTest.php
+++ b/e107_tests/tests/unit/e107_user_extendedTest.php
@@ -354,9 +354,6 @@
 			$this->fixRegistry('before');
 
 
-
-
-
 			$sc = e107::getScBatch('signup');
 
 			$template = array(
@@ -364,14 +361,34 @@
 				'extended-user-fields'  => "<label>{EXTENDED_USER_FIELD_TEXT}{EXTENDED_USER_FIELD_REQUIRED}</label>" // {EXTENDED_USER_FIELD_EDIT}
 			);
 
-			$expected = "<label>Text<span class='required'><!-- empty --></span></label><label>Dropdown<span class='required'><!-- empty --></span></label><label>Dbfield<span class='required'><!-- empty --></span></label><label>Integer<span class='required'><!-- empty --></span></label><label>Date<span class='required'><!-- empty --></span></label><label>Language<span class='required'><!-- empty --></span></label><label>Checkbox<span class='required'><!-- empty --></span></label><label>Predefined<span class='required'><!-- empty --></span></label><label>Addon<span class='required'><!-- empty --></span></label><label>Richtextarea<span class='required'><!-- empty --></span></label>-- Category Name --<label>Radio<span class='required'><!-- empty --></span></label><label>List<span class='required'><!-- empty --></span></label>-- Category Name 2 --<label>Country<span class='required'><!-- empty --></span></label>";
+			$expected = array(
+				"<label>Text<span class='required'><!-- empty --></span></label>",
+				"<label>Dropdown<span class='required'><!-- empty --></span></label>",
+				"<label>Dbfield<span class='required'><!-- empty --></span></label>",
+				"<label>Integer<span class='required'><!-- empty --></span></label>",
+				"<label>Date<span class='required'><!-- empty --></span></label>",
+				"<label>Language<span class='required'><!-- empty --></span></label>",
+				"<label>Checkbox<span class='required'><!-- empty --></span></label>",
+				"<label>Predefined<span class='required'><!-- empty --></span></label>",
+				"<label>Addon<span class='required'><!-- empty --></span></label>",
+				"<label>Richtextarea<span class='required'><!-- empty --></span></label>",
+				"-- Category Name --",
+				"<label>Radio<span class='required'><!-- empty --></span></label>",
+				"<label>List<span class='required'><!-- empty --></span></label>",
+				"-- Category Name 2 --",
+				"<label>Country<span class='required'><!-- empty --></span></label>"
+			);
 
 			$sc->template = $template;
 
 			$this->assertNotEmpty($sc->template);
 
 			$result = e107::getParser()->parseTemplate('{SIGNUP_EXTENDED_USER_FIELDS}', false, $sc);
-			$this->assertSame($expected, $result);
+			foreach($expected as $exp)
+			{
+				$this->assertStringContainsString($exp, $result);
+			}
+
 
 			foreach($this->structRequired as $field=>$v)
 			{