diff --git a/tests/System/TwoVisitsWithCustomVariablesTest.php b/tests/System/TwoVisitsWithCustomVariablesTest.php
index bd9ab2a..60b43c5 100644
--- a/tests/System/TwoVisitsWithCustomVariablesTest.php
+++ b/tests/System/TwoVisitsWithCustomVariablesTest.php
@@ -32,12 +32,20 @@ public function getApiForTesting()
         $idSite = self::$fixture->idSite;
         $dateTime = self::$fixture->dateTime;
 
+        $xmlFieldsToRemove = [];
+
+        if (version_compare(Version::VERSION, '5.4.0-b4', '<')) {
+            // the fixture used from core changed, so this metric might differ for older versions
+            $xmlFieldsToRemove = ['sum_visit_length', 'avg_time_on_site'];
+        }
+
         $apiToCall = array('VisitsSummary.get', 'CustomVariables.getCustomVariables');
 
         $return = array(
             array($apiToCall, array('idSite'       => 'all',
                                     'date'         => $dateTime,
                                     'periods'      => array('day', 'week'),
+                                    'xmlFieldsToRemove' => $xmlFieldsToRemove,
                                     'setDateLastN' => true)),
 
             // test w/ custom variable segments
@@ -45,6 +53,7 @@ public function getApiForTesting()
                 'idSite' => self::$fixture->idSite,
                 'date' => self::$fixture->dateTime,
                 'periods' => array('day'),
+                'xmlFieldsToRemove' => $xmlFieldsToRemove,
                 'testSuffix' => '_segmentCustomVarName',
                 'segment' => 'customVariablePageName=@SET WITH',
             )),
@@ -53,6 +62,7 @@ public function getApiForTesting()
                 'idSite' => self::$fixture->idSite,
                 'date' => self::$fixture->dateTime,
                 'periods' => array('day'),
+                'xmlFieldsToRemove' => $xmlFieldsToRemove,
                 'testSuffix' => '_segmentCustomVarValue',
                 'segment' => 'customVariableValue=@LoggedIn',
             )),
@@ -61,6 +71,7 @@ public function getApiForTesting()
                 'idSite' => self::$fixture->idSite,
                 'date' => self::$fixture->dateTime,
                 'periods' => array('day'),
+                'xmlFieldsToRemove' => $xmlFieldsToRemove,
                 'testSuffix' => '_segmentAll',
                 'segment' => 'customVariableName=@Othercustom,customVariablePageValue=@abcdefghi',
             )),
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
index ebe6828..aedbc63 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_day.xml
@@ -8,7 +8,7 @@
 				<nb_actions>6</nb_actions>
 				<nb_users>0</nb_users>
 				<max_actions>4</max_actions>
-				<sum_visit_length>722</sum_visit_length>
+				<sum_visit_length>725</sum_visit_length>
 				<bounce_count>2</bounce_count>
 				<nb_visits_converted>2</nb_visits_converted>
 				<goals>
@@ -39,7 +39,7 @@
 						<nb_actions>4</nb_actions>
 						<nb_users>0</nb_users>
 						<max_actions>4</max_actions>
-						<sum_visit_length>361</sum_visit_length>
+						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<goals>
@@ -84,7 +84,7 @@
 				<nb_actions>4</nb_actions>
 				<nb_users>0</nb_users>
 				<max_actions>4</max_actions>
-				<sum_visit_length>361</sum_visit_length>
+				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<goals>
@@ -110,7 +110,7 @@
 						<nb_actions>4</nb_actions>
 						<nb_users>0</nb_users>
 						<max_actions>4</max_actions>
-						<sum_visit_length>361</sum_visit_length>
+						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<goals>
@@ -131,7 +131,7 @@
 				<nb_actions>4</nb_actions>
 				<nb_users>0</nb_users>
 				<max_actions>4</max_actions>
-				<sum_visit_length>361</sum_visit_length>
+				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<goals>
@@ -157,7 +157,7 @@
 						<nb_actions>4</nb_actions>
 						<nb_users>0</nb_users>
 						<max_actions>4</max_actions>
-						<sum_visit_length>361</sum_visit_length>
+						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<goals>
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
index cc5f787..c3e5861 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml
@@ -7,7 +7,7 @@
 				<nb_visits>3</nb_visits>
 				<nb_actions>6</nb_actions>
 				<max_actions>4</max_actions>
-				<sum_visit_length>722</sum_visit_length>
+				<sum_visit_length>725</sum_visit_length>
 				<bounce_count>2</bounce_count>
 				<nb_visits_converted>2</nb_visits_converted>
 				<goals>
@@ -39,7 +39,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_actions>4</nb_actions>
 						<max_actions>4</max_actions>
-						<sum_visit_length>361</sum_visit_length>
+						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<goals>
@@ -86,7 +86,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_actions>4</nb_actions>
 				<max_actions>4</max_actions>
-				<sum_visit_length>361</sum_visit_length>
+				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<goals>
@@ -113,7 +113,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_actions>4</nb_actions>
 						<max_actions>4</max_actions>
-						<sum_visit_length>361</sum_visit_length>
+						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<goals>
@@ -135,7 +135,7 @@
 				<nb_visits>1</nb_visits>
 				<nb_actions>4</nb_actions>
 				<max_actions>4</max_actions>
-				<sum_visit_length>361</sum_visit_length>
+				<sum_visit_length>364</sum_visit_length>
 				<bounce_count>0</bounce_count>
 				<nb_visits_converted>1</nb_visits_converted>
 				<goals>
@@ -162,7 +162,7 @@
 						<nb_visits>1</nb_visits>
 						<nb_actions>4</nb_actions>
 						<max_actions>4</max_actions>
-						<sum_visit_length>361</sum_visit_length>
+						<sum_visit_length>364</sum_visit_length>
 						<bounce_count>0</bounce_count>
 						<nb_visits_converted>1</nb_visits_converted>
 						<goals>
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
index ab7f9f9..53cf1ad 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_day.xml
@@ -8,11 +8,11 @@
 			<nb_actions>6</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
 			<bounce_count>2</bounce_count>
-			<sum_visit_length>722</sum_visit_length>
+			<sum_visit_length>725</sum_visit_length>
 			<max_actions>4</max_actions>
 			<bounce_rate>67%</bounce_rate>
 			<nb_actions_per_visit>2</nb_actions_per_visit>
-			<avg_time_on_site>241</avg_time_on_site>
+			<avg_time_on_site>242</avg_time_on_site>
 		</result>
 		<result date="2010-01-04" />
 		<result date="2010-01-05" />
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
index cf97edb..82ba451 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__VisitsSummary.get_week.xml
@@ -8,11 +8,11 @@
 			<nb_actions>6</nb_actions>
 			<nb_visits_converted>2</nb_visits_converted>
 			<bounce_count>2</bounce_count>
-			<sum_visit_length>722</sum_visit_length>
+			<sum_visit_length>725</sum_visit_length>
 			<max_actions>4</max_actions>
 			<bounce_rate>67%</bounce_rate>
 			<nb_actions_per_visit>2</nb_actions_per_visit>
-			<avg_time_on_site>241</avg_time_on_site>
+			<avg_time_on_site>242</avg_time_on_site>
 		</result>
 		<result date="2010-01-04,2010-01-10" />
 		<result date="2010-01-11,2010-01-17" />
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
index bb01944..83e7daa 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -66,7 +66,7 @@
 			<nb_users>0</nb_users>
 			<conversion_rate>100%</conversion_rate>
 			<nb_actions_per_visit>4</nb_actions_per_visit>
-			<avg_time_on_site>00:06:01</avg_time_on_site>
+			<avg_time_on_site>00:06:04</avg_time_on_site>
 			<bounce_rate>0%</bounce_rate>
 			<nb_uniq_visitors>0</nb_uniq_visitors>
 		</row>
@@ -88,7 +88,7 @@
 		<nb_actions>24</nb_actions>
 		<nb_users>0</nb_users>
 		<max_actions>13</max_actions>
-		<sum_visit_length>1805</sum_visit_length>
+		<sum_visit_length>1814</sum_visit_length>
 		<bounce_count>4</bounce_count>
 		<nb_visits_converted>5</nb_visits_converted>
 		<goals>
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml
index 15cb2d0..61834da 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarName__VisitsSummary.get_day.xml
@@ -6,9 +6,9 @@
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
 	<bounce_count>0</bounce_count>
-	<sum_visit_length>361</sum_visit_length>
+	<sum_visit_length>364</sum_visit_length>
 	<max_actions>4</max_actions>
 	<bounce_rate>0%</bounce_rate>
 	<nb_actions_per_visit>4</nb_actions_per_visit>
-	<avg_time_on_site>361</avg_time_on_site>
+	<avg_time_on_site>364</avg_time_on_site>
 </result>
\ No newline at end of file
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml
index 15cb2d0..61834da 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables_segmentCustomVarValue__VisitsSummary.get_day.xml
@@ -6,9 +6,9 @@
 	<nb_actions>4</nb_actions>
 	<nb_visits_converted>1</nb_visits_converted>
 	<bounce_count>0</bounce_count>
-	<sum_visit_length>361</sum_visit_length>
+	<sum_visit_length>364</sum_visit_length>
 	<max_actions>4</max_actions>
 	<bounce_rate>0%</bounce_rate>
 	<nb_actions_per_visit>4</nb_actions_per_visit>
-	<avg_time_on_site>361</avg_time_on_site>
+	<avg_time_on_site>364</avg_time_on_site>
 </result>
\ No newline at end of file