diff --git a/compiled/cern/itb/frontend.xml b/compiled/cern/itb/frontend.xml
index ace3f1df0838d93f370610549dab1a22a2aa86e7..db81039e8f07fa0ba72d475280bba05aa96e5074 100644
--- a/compiled/cern/itb/frontend.xml
+++ b/compiled/cern/itb/frontend.xml
@@ -189,6 +189,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -233,6 +234,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -321,6 +323,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -368,6 +371,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -677,7 +681,7 @@
             <running_glideins_per_entry max="1" min="0" relative_to_queue="1.05"/>
          </config>
          <match match_expr='__import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)'>
-            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED==True && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
+            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED==True &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
                <match_attrs>
                   <match_attr name="EntryName" type="string"/>
                </match_attrs>
@@ -687,6 +691,7 @@
             <job query_expr='(IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)'>
                <match_attrs>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -708,7 +713,7 @@
             <running_glideins_per_entry max="1" min="0" relative_to_queue="1.05"/>
          </config>
          <match match_expr='__import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)'>
-            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED=!=False && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
+            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED=!=False &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
                <match_attrs>
                   <match_attr name="EntryName" type="string"/>
                </match_attrs>
@@ -718,6 +723,7 @@
             <job query_expr='(IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)'>
                <match_attrs>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
diff --git a/compiled/cern/itbdev/frontend.xml b/compiled/cern/itbdev/frontend.xml
index 696bd3c306e513cd9a6090a7ae8eafb7dbf616fb..55d20587bb25c60d9920418a7ff2a34537d5d5ba 100644
--- a/compiled/cern/itbdev/frontend.xml
+++ b/compiled/cern/itbdev/frontend.xml
@@ -156,6 +156,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -200,6 +201,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -288,6 +290,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -335,6 +338,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -644,7 +648,7 @@
             <running_glideins_per_entry max="1" min="0" relative_to_queue="1.05"/>
          </config>
          <match match_expr='__import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)'>
-            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED==True && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
+            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED==True &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
                <match_attrs>
                   <match_attr name="EntryName" type="string"/>
                </match_attrs>
@@ -654,6 +658,7 @@
             <job query_expr='(IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)'>
                <match_attrs>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -675,7 +680,7 @@
             <running_glideins_per_entry max="1" min="0" relative_to_queue="1.05"/>
          </config>
          <match match_expr='__import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)'>
-            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED=!=False && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
+            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED=!=False &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
                <match_attrs>
                   <match_attr name="EntryName" type="string"/>
                </match_attrs>
@@ -685,6 +690,7 @@
             <job query_expr='(IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)'>
                <match_attrs>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
diff --git a/compiled/fnal/itb/frontend.xml b/compiled/fnal/itb/frontend.xml
index efb5096c998d29cee6b8542a17f1ce54fda784dd..c0a8b40e1ab8003b80abf0bb63d5a0773b490899 100644
--- a/compiled/fnal/itb/frontend.xml
+++ b/compiled/fnal/itb/frontend.xml
@@ -189,6 +189,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -233,6 +234,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -321,6 +323,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -368,6 +371,7 @@
                   <match_attr name="DESIRED_Gatekeepers" type="string"/>
                   <match_attr name="DESIRED_Sites" type="string"/>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -677,7 +681,7 @@
             <running_glideins_per_entry max="1" min="0" relative_to_queue="1.05"/>
          </config>
          <match match_expr='__import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)'>
-            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED==True && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
+            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED==True &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
                <match_attrs>
                   <match_attr name="EntryName" type="string"/>
                </match_attrs>
@@ -687,6 +691,7 @@
             <job query_expr='(IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)'>
                <match_attrs>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
@@ -708,7 +713,7 @@
             <running_glideins_per_entry max="1" min="0" relative_to_queue="1.05"/>
          </config>
          <match match_expr='__import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True' start_expr='(ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)'>
-            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED=!=False && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
+            <factory query_expr='GLIDEIN_OVERLOADED_ENABLED=!=False &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)'>
                <match_attrs>
                   <match_attr name="EntryName" type="string"/>
                </match_attrs>
@@ -718,6 +723,7 @@
             <job query_expr='(IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)'>
                <match_attrs>
                   <match_attr name="DESIRED_Entries" type="string"/>
+                  <match_attr name="TestEventRates" type="string"/>
                </match_attrs>
                <schedds>
                </schedds>
diff --git a/inventory/classes/itb.yml b/inventory/classes/itb.yml
index cbffdf8b71ae1e6bf1b7dbf57329bd27c9d0a90f..1dda2441c3565282f4ae7b1416608ec3dc58c117 100644
--- a/inventory/classes/itb.yml
+++ b/inventory/classes/itb.yml
@@ -69,6 +69,7 @@ parameters:
         (IS_TEST_JOB=?=UNDEFINED) &amp;&amp; ( isUndefined(RequestGPUs) || RequestGPUs =?= 0)
       job_query_expr_match_attrs:
         - name: DESIRED_Entries
+        - name: TestEventRates
       ~credentials:
         - absfname: "${proxy_path}"
           security_class: cmspilot
@@ -226,14 +227,14 @@ parameters:
       match_expr: >-
         __import__("CMSGlobalMatcher").match_site_or_entry_or_gatekeeper(job, glidein) and job.get(TestEventRates,False) is True
       factory_query_expr: >-
-        GLIDEIN_OVERLOADED_ENABLED==True && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)
+        GLIDEIN_OVERLOADED_ENABLED==True &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)
       start_expr: >-
         (ifthenelse(DESIRED_Sites isnt undefined, stringListMember(GLIDEIN_CMSSite,DESIRED_Sites), undefined) || ifthenelse(DESIRED_Gatekeepers isnt undefined, stringListMember(split(GLIDEIN_Gatekeeper)[0], DESIRED_Gatekeepers), undefined) || ifthenelse(DESIRED_Entries isnt undefined, stringListMember(GLIDEIN_Entry_Name,DESIRED_Entries), undefined)) &amp;&amp; (isUndefined(RequestGPUs) || RequestGPUs =?= 0) &amp;&amp; (TestEventRates==True)
 
     test-event-rates-off:
       <<: *test-event-rates-on
       factory_query_expr: >-
-        GLIDEIN_OVERLOADED_ENABLED=!=False && stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)
+        GLIDEIN_OVERLOADED_ENABLED=!=False &amp;&amp; stringListsIntersect( &amp;&amp; !stringListMember("CMSGPU",GLIDEIN_Supported_VOs) &amp;&amp; GLIDEIN_GridType=="condor" !ifthenelse(CMS_Local_Entry isnt undefined, CMS_Local_Entry, False)
 
   factory_collectors:
     - node: vocms0204.cern.ch