diff --git a/tests/CI/pilot_newSchema.json b/tests/CI/pilot_newSchema.json
index 25ec2d20..0c8c1d32 100644
--- a/tests/CI/pilot_newSchema.json
+++ b/tests/CI/pilot_newSchema.json
@@ -94,9 +94,9 @@
 				"TEST": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
 				"TEST-MP": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
 				"TEST-FULL": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements, LaunchAgent",
-				"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
-				"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
-				"LHCbDD": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements",
+				"LHCb": "CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
+				"LHCbD": "CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
+				"LHCbDD": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements",
 				"TEST-REVISED-COMMANDS": "CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitectureWithoutCLI, ConfigureCPURequirements"
       }
 		}
diff --git a/tests/CI/pilot_oldSchema.json b/tests/CI/pilot_oldSchema.json
index bd05b450..3502e3b5 100644
--- a/tests/CI/pilot_oldSchema.json
+++ b/tests/CI/pilot_oldSchema.json
@@ -46,7 +46,7 @@
           "LHCbAddCVMFSTags",
           "CheckWNCapabilities",
           "ConfigureSite",
-          "LHCbConfigureArchitecture",
+          "ConfigureArchitecture",
           "ConfigureCPURequirements"
         ],
         "LHCbD": [
@@ -58,7 +58,7 @@
           "LHCbAddCVMFSTags",
           "CheckWNCapabilities",
           "ConfigureSite",
-          "LHCbConfigureArchitecture",
+          "ConfigureArchitecture",
           "ConfigureCPURequirements"
         ],
         "LHCbDD": [
@@ -70,7 +70,7 @@
           "LHCbAddCVMFSTags",
           "CheckWNCapabilities",
           "ConfigureSite",
-          "LHCbConfigureArchitecture",
+          "ConfigureArchitecture",
           "ConfigureCPURequirements"
         ]
       },