diff --git a/sendreceive/obsw_multiple_commands_sender_receiver.py b/sendreceive/obsw_multiple_commands_sender_receiver.py
index 274204c3d182ca459b708717e17a8ac044bd5cf5..d0a559094f08087e28e3fb65f54e859745e7859f 100644
--- a/sendreceive/obsw_multiple_commands_sender_receiver.py
+++ b/sendreceive/obsw_multiple_commands_sender_receiver.py
@@ -53,6 +53,7 @@ class MultipleCommandSenderReceiver(SequentialCommandSenderReceiver):
         try:
             self._tm_listener.mode_id = g.ModeList.UnitTest
             self._tm_listener.event_mode_change.set()
+            time.sleep(0.1)
             # TC info queue is set in this function
             self.__send_all_queue()
             self.wait_for_last_replies_listening(self._tm_timeout / 1.4)
diff --git a/test/obsw_pus_service_test.py b/test/obsw_pus_service_test.py
index ef29c183df71322e79593d5b0a1564931f05b136..f06c3389febc4556f3a6fb1398bccb6adf9388a0 100644
--- a/test/obsw_pus_service_test.py
+++ b/test/obsw_pus_service_test.py
@@ -75,8 +75,8 @@ class TestService5(TestService):
         LOGGER.info("Testing Service 5")
         # Wait intervals after TC 1,2 and 3 with specified wait times
         # This is required because the OBSW tasks runs with fixed sequences
-        cls.wait_intervals = [1, 2, 3]
-        cls.wait_time = [2.0, 2.0, 2.0]
+        cls.wait_intervals = [1, 2, 3, 4]
+        cls.wait_time = [2.0, 2.0, 2.0, 1.5]
         pack_service5_test_into(cls.test_queue)
 
     def test_Service5(self):
@@ -154,8 +154,8 @@ class TestService17(TestService):
     def setUpClass(cls: TestService):
         super().setUpClass()
         LOGGER.info("Testing Service 17")
-        cls.wait_intervals = [2, 3]
-        cls.wait_time = [2, 1]
+        cls.wait_intervals = [1, 2, 3, 4]
+        cls.wait_time = [1, 1, 1, 1]
         cls.tm_timeout = g.G_TM_TIMEOUT
         pack_service17_test_into(cls.test_queue)