diff --git a/OBSW_UdpClient.py b/OBSW_UdpClient.py
index 16e1230f13752464aa66ff853bab6338292b2731..4fc364425f130801d657b256cef9f0d45d787421 100644
--- a/OBSW_UdpClient.py
+++ b/OBSW_UdpClient.py
@@ -18,7 +18,7 @@
     The script can be used by specifying command line parameters. Please run this script with the -h flag
     or without any command line parameters to display options. GUI is work-in-progress
     It might be necessary to set board or PC IP address if using ethernet communication.
-    Default values should work normally though.
+    Default values should work normally though. Use higher timeout value (-t Parameter) for STM32
 
     Example command to test service 17,
     assuming no set client IP (set manually to PC IP Address if necessary) and default board IP 169.254.1.38:
diff --git a/sendreceive/OBSW_MultipleCommandsSenderReceiver.py b/sendreceive/OBSW_MultipleCommandsSenderReceiver.py
index c94f44a2c0743efe31258c6b63cee9cb12cfb3a1..be898686c52988ae600f45b021a6b4359f312d45 100644
--- a/sendreceive/OBSW_MultipleCommandsSenderReceiver.py
+++ b/sendreceive/OBSW_MultipleCommandsSenderReceiver.py
@@ -95,7 +95,7 @@ class MultipleCommandSenderReceiver(SequentialCommandSenderReceiver):
         elapsed_time_seconds = 0
         while elapsed_time_seconds < self.tmTimeout:
             elapsed_time_seconds = time.time() - start_time
-            tmReady = self.comInterface.dataAvailable(2.0)
+            tmReady = self.comInterface.dataAvailable(self.tmTimeout)
             if tmReady:
                 self.receiveTelemetryAndStoreInformation()
 
diff --git a/test/OBSW_UnitTest.py b/test/OBSW_UnitTest.py
index 582e12835ecf3def94afc7579750aef72334731c..b71698ee1874b8e8ff3808eda103df00958b4c1b 100644
--- a/test/OBSW_UnitTest.py
+++ b/test/OBSW_UnitTest.py
@@ -44,7 +44,7 @@ class TestService(unittest.TestCase):
         cls.displayMode = "long"
 
         # default timeout for receiving TM, set in subclass manually
-        cls.tmTimeout = 3
+        cls.tmTimeout = g.tmTimeout
         # wait intervals between tc send bursts.
         # Example: [2,4] sends to send 2 tc from queue and wait, then sends another 2 and wait again
         cls.waitIntervals = []
@@ -54,7 +54,7 @@ class TestService(unittest.TestCase):
         # default wait time between tc send bursts
         cls.waitTime = 5.0
         cls.testQueue = queue.Queue()
-        cls.tcTimeoutFactor = 3.0
+        cls.tcTimeoutFactor = g.tcSendTimeoutFactor
         cls.printFile = True
         cls.tmtcPrinter = TmtcPrinter(cls.displayMode, cls.printFile, True)
         if g.comIF == 0:
@@ -224,7 +224,7 @@ class TestService17(TestService):
         print("Testing Service 17")
         cls.waitIntervals = [2]
         cls.waitTime = 2
-        cls.tmTimeout = 2
+        cls.tmTimeout = g.tmTimeout
         packService17TestInto(cls.testQueue)
 
     def test_Service17(self):