diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
index 0e29bf13e5f..6ab7e823aad 100644
--- a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
+++ b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
@@ -346,6 +346,16 @@ def execute(self):
 
         return S_OK()
 
+    def _getSortedQueues(self):
+        """
+        Sorts the queues randomly. Can be overriden in derived classes for other ways of shuffling
+
+        :return: list of sorted queue dictionaries
+        """
+        queueDictItems = list(self.queueDict.items())
+        random.shuffle(queueDictItems)
+        return queueDictItems
+
     def submitPilots(self):
         """Go through defined computing elements and submit pilots if necessary and possible
 
@@ -365,8 +375,7 @@ def submitPilots(self):
 
         self.totalSubmittedPilots = 0
 
-        queueDictItems = list(self.queueDict.items())
-        random.shuffle(queueDictItems)
+        queueDictItems = self._getSortedQueues()
 
         for queueName, queueDictionary in queueDictItems:
             # now submitting to the single queues