diff --git a/test/obsw_pus_service_test.py b/test/obsw_pus_service_test.py
index a7e3b42497c6a57e268ba0ef9e117bf4fcbc5db9..857013b158a90a76e1add81cc42a917e5612875e 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, 4]
-        cls.wait_time = [2.0, 2.0, 2.0, 2.0]
+        cls.wait_intervals = [1, 2, 3]
+        cls.wait_time = [2.0, 2.0, 2.0]
         pack_service5_test_into(cls.test_queue)
 
     def test_Service5(self):
@@ -111,8 +111,8 @@ class TestService8(TestService):
     def setUpClass(cls: TestService):
         super().setUpClass()
         LOGGER.info("Testing Service 8")
-        cls.wait_intervals = [1, 2, 3, 4]
-        cls.wait_time = [2.0, 2.0, 2.0, 2.0]
+        cls.wait_intervals = [1, 2, 3, 4, 5]
+        cls.wait_time = [1.5, 1.5, 2.2, 2.2, 2.0]
         cls.data_reply_count = 0
         pack_service8_test_into(cls.test_queue)