diff --git a/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_PBSResourceUsage.py b/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_PBSResourceUsage.py
index 036f5263107..d010889f2b1 100644
--- a/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_PBSResourceUsage.py
+++ b/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_PBSResourceUsage.py
@@ -76,7 +76,6 @@ def test_getResourcUsage(mocker):
         side_effect=[S_OK(RRCKI_OUT)],
     )
     mocker.patch("os.path.isfile", return_value=True)
-    mocker.patch.dict(os.environ, {"PBS_O_QUEUE": "lhcb", "PBS_O_QPATH": "/some/path"})
 
     pbsRU = PBSResourceUsage("55755440.seer.t1.grid.kiae.ru", {"Queue": "lhcb", "BinaryPath": "/some/path"})
     res = pbsRU.getResourceUsage()
diff --git a/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_SGEResourceUsage.py b/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_SGEResourceUsage.py
index 3aac6ddb5dc..70461e091c0 100644
--- a/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_SGEResourceUsage.py
+++ b/src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_SGEResourceUsage.py
@@ -46,7 +46,7 @@ def test_getResourceUsage(mocker):
         return_value=S_OK(RESULT_FROM_SGE),
     )
 
-    sgeResourceUsage = SGEResourceUsage()
+    sgeResourceUsage = SGEResourceUsage("1234", {"Queue": "Test"})
     res = sgeResourceUsage.getResourceUsage()
 
     assert res["OK"]
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py b/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py
index a568bc957d3..ed796474f7e 100755
--- a/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py
+++ b/src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py
@@ -285,6 +285,9 @@ def execute(self):
         if queue:
             self.jobReport.setJobParameter(par_name="CEQueue", par_value=queue, sendFlag=False)
 
+        if batchSystem := gConfig.getValue("/LocalSite/BatchSystem/Type", ""):
+            self.jobReport.setJobParameter(par_name="BatchSystem", par_value=batchSystem, sendFlag=False)
+
         self.log.debug(f"Before self._submitJob() ({self.ceName}CE)")
         result = self._submitJob(
             jobID=jobID,