diff --git a/CondCore/CondDB/test/BuildFile.xml b/CondCore/CondDB/test/BuildFile.xml
index eb81a6ea7cae9..f0b1f79394c57 100644
--- a/CondCore/CondDB/test/BuildFile.xml
+++ b/CondCore/CondDB/test/BuildFile.xml
@@ -41,10 +41,10 @@
 <bin file="testGroupSelection.cpp" name="testGroupSelection">
 </bin>
 
-<architecture name="(slc|cc).*_amd64_.*">
+<ifarch value="x86_64">
   <bin file="testConnectionPool.cpp" name="testConnectionPool">
     <use name="CondFormats/RunInfo"/>
   </bin>
 
   <test name="condTestRegression" command="condTestRegression.py"/>
-</architecture>
+</ifarch>
diff --git a/CondTools/Ecal/test/BuildFile.xml b/CondTools/Ecal/test/BuildFile.xml
index e1bebed290068..52c10dd65533b 100644
--- a/CondTools/Ecal/test/BuildFile.xml
+++ b/CondTools/Ecal/test/BuildFile.xml
@@ -1,5 +1,5 @@
 <use name="CondTools/Ecal"/>
-<architecture name="(slc|cc).*_amd64_.*">
+<ifarch value="x86_64">
   <ifcxx11_abi value="1">
     <flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
   </ifcxx11_abi>
@@ -24,4 +24,4 @@
   <test name="EcalTPGTowerStatus_O2O_test" command="EcalTPGTowerStatus_O2O_test.sh"/>
   <test name="EcalADCToGeV_update_test" command="EcalADCToGeV_update_test.sh"/>
   <test name="EcalIntercalibConstants_O2O_test" command="EcalIntercalibConstants_O2O_test.sh"/>
-</architecture>
+</ifarch>
diff --git a/CondTools/RunInfo/test/BuildFile.xml b/CondTools/RunInfo/test/BuildFile.xml
index 07301e711c422..89180eab12eea 100644
--- a/CondTools/RunInfo/test/BuildFile.xml
+++ b/CondTools/RunInfo/test/BuildFile.xml
@@ -1,6 +1,6 @@
 <use name="CondTools/RunInfo"/>
-<architecture name="(slc|cc).*_amd64_.*">
+<ifarch value="x86_64">
   <use name="py3-sqlalchemy"/>
   <test name="RunInfoStart_O2O_test" command="RunInfoStart_O2O_test.sh"/>
-</architecture>
+</ifarch>
 <test name="CondToolsRunInfoTest" command="test_runinfo.sh"/>
diff --git a/CondTools/SiStrip/test/BuildFile.xml b/CondTools/SiStrip/test/BuildFile.xml
index faaafdb804527..910886174a153 100644
--- a/CondTools/SiStrip/test/BuildFile.xml
+++ b/CondTools/SiStrip/test/BuildFile.xml
@@ -1,10 +1,10 @@
-<architecture name="(slc|cc).*_amd64_.*">
+<ifarch value="x86_64">
   <ifcxx11_abi value="1">
     <flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
   </ifcxx11_abi>
   <test name="SiStripDCS_O2O_test" command="testSiStripDCSO2O.sh"/>
   <test name="SiStripDAQ_O2O_test" command="testSiStripDAQO2O.sh"/>
-</architecture>
+</ifarch>
 
 <bin file="runTests.cpp" name="testCondToolsSiStripBuildersReaders">
   <use name="FWCore/Utilities"/>
diff --git a/OnlineDB/Oracle/test/BuildFile.xml b/OnlineDB/Oracle/test/BuildFile.xml
index ec314fc3ad2a3..aea4498eb6766 100644
--- a/OnlineDB/Oracle/test/BuildFile.xml
+++ b/OnlineDB/Oracle/test/BuildFile.xml
@@ -1,7 +1,6 @@
-<architecture name="_amd64_">
+<ifarch value="x86_64">
   <bin name="test_occi_std_length" file="test.cpp">
     <use name="oracleocci"/>
     <flags TEST_RUNNER_ARGS="12154"/>
   </bin>
-
-</architecture>
+</ifarch>