diff --git a/tests/System/TwoVisitsWithCustomVariablesTest.php b/tests/System/TwoVisitsWithCustomVariablesTest.php
index 60b43c5..1966b95 100644
--- a/tests/System/TwoVisitsWithCustomVariablesTest.php
+++ b/tests/System/TwoVisitsWithCustomVariablesTest.php
@@ -86,7 +86,8 @@ public function getApiForTesting()
                 'apiModule'     => 'CustomVariables',
                 'apiAction'     => 'getCustomVariablesValuesFromNameId',
                 'supertableApi' => 'CustomVariables.getCustomVariables',
-                'testSuffix'    => '__subtable')
+                // the percent of total columns changed in 6.0.0-b3
+                'testSuffix'    => '__subtable' . (version_compare(Version::VERSION, '6.0.0-b3', '<') ? '_old' : ''))
             );
         }
 
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 f5222e7..1ad3e14 100644
--- a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml
@@ -28,10 +28,6 @@
 			<conversion_rate>The percentage of visits that triggered a conversion. The conversion rate is calculated using the number of visits that converted at least one goal. Visits converting multiple goals are only counted once in the conversion rate.</conversion_rate>
 			<nb_visits_percent_of_total>The percentage of the report's total Visits that this row represents.</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>The percentage of the report's total Actions that this row represents.</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>The percentage of the report's total Visits with Conversions that this row represents.</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>The percentage of the report's total Conversions that this row represents.</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>The percentage of the report's total Bounces that this row represents.</bounce_count_percent_of_total>
-			<revenue_percent_of_total>The percentage of the report's total Revenue that this row represents.</revenue_percent_of_total>
 		</metricsDocumentation>
 		<processedMetrics>
 			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
@@ -50,10 +46,6 @@
 			<conversion_rate>percent</conversion_rate>
 			<nb_visits_percent_of_total>percent</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>percent</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>percent</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>percent</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>percent</bounce_count_percent_of_total>
-			<revenue_percent_of_total>percent</revenue_percent_of_total>
 		</metricTypes>
 		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2010-01-03&amp;idSubtable=1</imageGraphUrl>
 		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2009-12-05,2010-01-03&amp;idSubtable=1</imageGraphEvolutionUrl>
@@ -62,19 +54,15 @@
 	<columns>
 		<label>Custom Variable value</label>
 		<nb_visits>Visits</nb_visits>
+		<nb_visits_percent_of_total>Visits (%)</nb_visits_percent_of_total>
 		<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
 		<nb_actions>Actions</nb_actions>
+		<nb_actions_percent_of_total>Actions (%)</nb_actions_percent_of_total>
 		<nb_users>Users</nb_users>
 		<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
 		<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
 		<bounce_rate>Bounce Rate</bounce_rate>
 		<conversion_rate>Conversion Rate</conversion_rate>
-		<nb_visits_percent_of_total>Visits (% of total)</nb_visits_percent_of_total>
-		<nb_actions_percent_of_total>Actions (% of total)</nb_actions_percent_of_total>
-		<nb_visits_converted_percent_of_total>Visits with Conversions (% of total)</nb_visits_converted_percent_of_total>
-		<nb_conversions_percent_of_total>Conversions (% of total)</nb_conversions_percent_of_total>
-		<bounce_count_percent_of_total>Bounces (% of total)</bounce_count_percent_of_total>
-		<revenue_percent_of_total>Revenue (% of total)</revenue_percent_of_total>
 	</columns>
 	<reportData>
 		<row>
@@ -84,10 +72,6 @@
 			<nb_users>0</nb_users>
 			<nb_visits_percent_of_total>14.3%</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>16.7%</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>20%</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>16.7%</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>0%</bounce_count_percent_of_total>
-			<revenue_percent_of_total>0%</revenue_percent_of_total>
 			<conversion_rate>100%</conversion_rate>
 			<nb_actions_per_visit>4</nb_actions_per_visit>
 			<avg_time_on_site>00:06:04</avg_time_on_site>
@@ -101,10 +85,6 @@
 			<nb_users>0</nb_users>
 			<nb_visits_percent_of_total>28.6%</nb_visits_percent_of_total>
 			<nb_actions_percent_of_total>8.3%</nb_actions_percent_of_total>
-			<nb_visits_converted_percent_of_total>20%</nb_visits_converted_percent_of_total>
-			<nb_conversions_percent_of_total>33.3%</nb_conversions_percent_of_total>
-			<bounce_count_percent_of_total>50%</bounce_count_percent_of_total>
-			<revenue_percent_of_total>50%</revenue_percent_of_total>
 			<conversion_rate>50%</conversion_rate>
 			<nb_actions_per_visit>1</nb_actions_per_visit>
 			<avg_time_on_site>00:03:01</avg_time_on_site>
diff --git a/tests/System/expected/test_twoVisitsWithCustomVariables__subtable_old__API.getProcessedReport_day.xml b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable_old__API.getProcessedReport_day.xml
new file mode 100644
index 0000000..f5222e7
--- /dev/null
+++ b/tests/System/expected/test_twoVisitsWithCustomVariables__subtable_old__API.getProcessedReport_day.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<result>
+	<website>Piwik test</website>
+	<prettyDate>Sunday, January 3, 2010</prettyDate>
+	<metadata>
+		<category>Visitors</category>
+		<name>Custom Variables</name>
+		<module>CustomVariables</module>
+		<action>getCustomVariablesValuesFromNameId</action>
+		<dimension>Custom Variable value</dimension>
+		<documentation>This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. &lt;br /&gt; For more information about Custom Variables in general, read the &lt;a href=&quot;https://matomo.org/docs/custom-variables/&quot; rel=&quot;noreferrer noopener&quot; target=&quot;_blank&quot;&gt;Custom Variables documentation on matomo.org&lt;/a&gt;</documentation>
+		<onlineGuideUrl>https://matomo.org/docs/custom-variables/</onlineGuideUrl>
+		<isSubtableReport>1</isSubtableReport>
+		<metrics>
+			<nb_visits>Visits</nb_visits>
+			<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
+			<nb_actions>Actions</nb_actions>
+			<nb_users>Users</nb_users>
+		</metrics>
+		<metricsDocumentation>
+			<nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits>
+			<nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors>
+			<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
+			<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
+			<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
+			<avg_time_on_site>The average duration of a visit.</avg_time_on_site>
+			<bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
+			<conversion_rate>The percentage of visits that triggered a conversion. The conversion rate is calculated using the number of visits that converted at least one goal. Visits converting multiple goals are only counted once in the conversion rate.</conversion_rate>
+			<nb_visits_percent_of_total>The percentage of the report's total Visits that this row represents.</nb_visits_percent_of_total>
+			<nb_actions_percent_of_total>The percentage of the report's total Actions that this row represents.</nb_actions_percent_of_total>
+			<nb_visits_converted_percent_of_total>The percentage of the report's total Visits with Conversions that this row represents.</nb_visits_converted_percent_of_total>
+			<nb_conversions_percent_of_total>The percentage of the report's total Conversions that this row represents.</nb_conversions_percent_of_total>
+			<bounce_count_percent_of_total>The percentage of the report's total Bounces that this row represents.</bounce_count_percent_of_total>
+			<revenue_percent_of_total>The percentage of the report's total Revenue that this row represents.</revenue_percent_of_total>
+		</metricsDocumentation>
+		<processedMetrics>
+			<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
+			<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
+			<bounce_rate>Bounce Rate</bounce_rate>
+			<conversion_rate>Conversion Rate</conversion_rate>
+		</processedMetrics>
+		<metricTypes>
+			<nb_visits>number</nb_visits>
+			<nb_uniq_visitors>number</nb_uniq_visitors>
+			<nb_actions>number</nb_actions>
+			<nb_users>number</nb_users>
+			<nb_actions_per_visit>number</nb_actions_per_visit>
+			<avg_time_on_site>duration_s</avg_time_on_site>
+			<bounce_rate>percent</bounce_rate>
+			<conversion_rate>percent</conversion_rate>
+			<nb_visits_percent_of_total>percent</nb_visits_percent_of_total>
+			<nb_actions_percent_of_total>percent</nb_actions_percent_of_total>
+			<nb_visits_converted_percent_of_total>percent</nb_visits_converted_percent_of_total>
+			<nb_conversions_percent_of_total>percent</nb_conversions_percent_of_total>
+			<bounce_count_percent_of_total>percent</bounce_count_percent_of_total>
+			<revenue_percent_of_total>percent</revenue_percent_of_total>
+		</metricTypes>
+		<imageGraphUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2010-01-03&amp;idSubtable=1</imageGraphUrl>
+		<imageGraphEvolutionUrl>index.php?module=API&amp;method=ImageGraph.get&amp;idSite=1&amp;apiModule=CustomVariables&amp;apiAction=getCustomVariablesValuesFromNameId&amp;period=day&amp;date=2009-12-05,2010-01-03&amp;idSubtable=1</imageGraphEvolutionUrl>
+		<uniqueId>CustomVariables_getCustomVariablesValuesFromNameId</uniqueId>
+	</metadata>
+	<columns>
+		<label>Custom Variable value</label>
+		<nb_visits>Visits</nb_visits>
+		<nb_uniq_visitors>Unique visitors</nb_uniq_visitors>
+		<nb_actions>Actions</nb_actions>
+		<nb_users>Users</nb_users>
+		<nb_actions_per_visit>Actions per Visit</nb_actions_per_visit>
+		<avg_time_on_site>Avg. Time on Website</avg_time_on_site>
+		<bounce_rate>Bounce Rate</bounce_rate>
+		<conversion_rate>Conversion Rate</conversion_rate>
+		<nb_visits_percent_of_total>Visits (% of total)</nb_visits_percent_of_total>
+		<nb_actions_percent_of_total>Actions (% of total)</nb_actions_percent_of_total>
+		<nb_visits_converted_percent_of_total>Visits with Conversions (% of total)</nb_visits_converted_percent_of_total>
+		<nb_conversions_percent_of_total>Conversions (% of total)</nb_conversions_percent_of_total>
+		<bounce_count_percent_of_total>Bounces (% of total)</bounce_count_percent_of_total>
+		<revenue_percent_of_total>Revenue (% of total)</revenue_percent_of_total>
+	</columns>
+	<reportData>
+		<row>
+			<label>LoggedIn</label>
+			<nb_visits>1</nb_visits>
+			<nb_actions>4</nb_actions>
+			<nb_users>0</nb_users>
+			<nb_visits_percent_of_total>14.3%</nb_visits_percent_of_total>
+			<nb_actions_percent_of_total>16.7%</nb_actions_percent_of_total>
+			<nb_visits_converted_percent_of_total>20%</nb_visits_converted_percent_of_total>
+			<nb_conversions_percent_of_total>16.7%</nb_conversions_percent_of_total>
+			<bounce_count_percent_of_total>0%</bounce_count_percent_of_total>
+			<revenue_percent_of_total>0%</revenue_percent_of_total>
+			<conversion_rate>100%</conversion_rate>
+			<nb_actions_per_visit>4</nb_actions_per_visit>
+			<avg_time_on_site>00:06:04</avg_time_on_site>
+			<bounce_rate>0%</bounce_rate>
+			<nb_uniq_visitors>0</nb_uniq_visitors>
+		</row>
+		<row>
+			<label>LoggedOut</label>
+			<nb_visits>2</nb_visits>
+			<nb_actions>2</nb_actions>
+			<nb_users>0</nb_users>
+			<nb_visits_percent_of_total>28.6%</nb_visits_percent_of_total>
+			<nb_actions_percent_of_total>8.3%</nb_actions_percent_of_total>
+			<nb_visits_converted_percent_of_total>20%</nb_visits_converted_percent_of_total>
+			<nb_conversions_percent_of_total>33.3%</nb_conversions_percent_of_total>
+			<bounce_count_percent_of_total>50%</bounce_count_percent_of_total>
+			<revenue_percent_of_total>50%</revenue_percent_of_total>
+			<conversion_rate>50%</conversion_rate>
+			<nb_actions_per_visit>1</nb_actions_per_visit>
+			<avg_time_on_site>00:03:01</avg_time_on_site>
+			<bounce_rate>100%</bounce_rate>
+			<nb_uniq_visitors>0</nb_uniq_visitors>
+		</row>
+	</reportData>
+	<reportMetadata />
+	<reportTotal>
+		<nb_visits>7</nb_visits>
+		<nb_actions>24</nb_actions>
+		<nb_users>0</nb_users>
+		<max_actions>13</max_actions>
+		<sum_visit_length>1814</sum_visit_length>
+		<bounce_count>4</bounce_count>
+		<nb_visits_converted>5</nb_visits_converted>
+		<goals>
+			<row idgoal="1">
+				<nb_conversions>5</nb_conversions>
+				<nb_visits_converted>5</nb_visits_converted>
+				<revenue>2000</revenue>
+			</row>
+			<row idgoal="2">
+				<nb_conversions>1</nb_conversions>
+				<nb_visits_converted>1</nb_visits_converted>
+				<revenue>0</revenue>
+			</row>
+		</goals>
+		<nb_conversions>6</nb_conversions>
+		<revenue>2000</revenue>
+		<nb_actions_per_visit>11</nb_actions_per_visit>
+	</reportTotal>
+</result>
\ No newline at end of file