diff --git a/validphys2/src/validphys/tests/conftest.py b/validphys2/src/validphys/tests/conftest.py
index 3940e0d678..38989e1cf3 100644
--- a/validphys2/src/validphys/tests/conftest.py
+++ b/validphys2/src/validphys/tests/conftest.py
@@ -35,7 +35,7 @@ def tmp(tmpdir):
 DATA = [
     {'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
     {'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy'},
-    {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
+    {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'sys_10'},
     # Explicitly put a CMS dataset between the two ATLAS
     SINGLE_DATAPOINT,
 ]
@@ -47,7 +47,7 @@ def tmp(tmpdir):
         'datasets': [
             {'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
             {'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy'},
-            {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
+            {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'sys_10'},
         ],
     }
 ]
@@ -60,7 +60,7 @@ def tmp(tmpdir):
 DATA_THCOVMAT = [
     {'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
     {'dataset': 'CHORUS_CC_NOTFIXED_PB_NU-SIGMARED', 'variant': 'legacy_dw'},
-    {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
+    {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'sys_10'},
     {'dataset': 'ATLAS_WJ_8TEV_WP-PT', 'variant': 'legacy'},
     {'dataset': 'LHCB_Z0_8TEV_MUON_Y', 'cfac': ['NRM']},
 ]
diff --git a/validphys2/src/validphys/tests/test_plots.py b/validphys2/src/validphys/tests/test_plots.py
index 12c7c8523e..1780c9dbc1 100644
--- a/validphys2/src/validphys/tests/test_plots.py
+++ b/validphys2/src/validphys/tests/test_plots.py
@@ -81,7 +81,7 @@ def test_plot_xq2():
     dataset_inputs = [
         {'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
         {'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy'},
-        {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy'},
+        {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM']},
     ]
 
     return API.plot_xq2(
@@ -107,12 +107,7 @@ def test_plot_xq2_custom():
     dataset_inputs = [
         {'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy', 'custom_group': 'one'},
         {'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy', 'custom_group': 'one'},
-        {
-            'dataset': 'CMS_Z0J_8TEV_PT-Y',
-            'cfac': ['NRM'],
-            'variant': 'legacy',
-            'custom_group': 'two',
-        },
+        {'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'custom_group': 'two'},
     ]
 
     return API.plot_xq2(