diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
index 9c559a69a6ba11b9c43e1e78d3acb8089944e801..c071dddfe8570f987079807fc76c7ef530132069 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_beam_device.py
@@ -30,12 +30,12 @@ class TestBeamDevice(base.TestCase):
     
     def test_get_pointing_directions(self):
         """Verify can read pointings attribute and length matches without err"""
-        with DeviceTestContext(beam.Beam, process=True) as proxy:
+        with DeviceTestContext(beam.Beam, process=True, timeout=10) as proxy:
             self.assertEqual(96, len(proxy.read_attribute(
                 "HBAT_pointing_direction_R").value))
 
     def test_get_pointing_timestamps(self):
         """Verify can read timestamps attribute and length matches without err"""
-        with DeviceTestContext(beam.Beam, process=True) as proxy:
+        with DeviceTestContext(beam.Beam, process=True, timeout=10) as proxy:
             self.assertEqual(96, len(proxy.read_attribute(
                 "HBAT_pointing_timestamp_R").value))
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py
index 7779cbdf4d261f4620a6836ec87aab35ae71d3c2..b4154a1467ae3cdbf6771520c3a31dd449f17fd6 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py
@@ -42,31 +42,31 @@ class TestRecvDevice(base.TestCase):
 
     def test_get_hbat_bf_delay_step_delays(self):
         """Verify can read delay step attribute and length matches without err"""
-        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True) as proxy:
+        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True, timeout=10) as proxy:
             self.init_device(proxy)
             self.assertEqual(32, len(proxy.get_hbat_bf_delay_step_delays()))
 
     def test_get_hbat_reference_itrf(self):
         """Verify can read hbat reference itrf attribute and length matches without err"""
-        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True) as proxy:
+        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True, timeout=10) as proxy:
             self.init_device(proxy)
             self.assertEqual(288, len(proxy.get_hbat_reference_itrf()))     # 96x3=288
     
     def test_get_hbat_antenna_itrf(self):
         """Verify can read hbat antenna itrf attribute and length matches without err"""
-        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True) as proxy:
+        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True, timeout=10) as proxy:
             self.init_device(proxy)
             self.assertEqual(4608, len(proxy.get_hbat_antenna_itrf()))     # 96x16X3=4608
 
     def test_get_hbat_signal_input_delays(self):
         """Verify can read signal input delay attribute and length matches without err"""
-        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True) as proxy:
+        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True, timeout=10) as proxy:
             self.init_device(proxy)
             self.assertEqual(3072, len(proxy.get_hbat_signal_input_delays()))     # 96x32=3072
     
     def test_calculate_HBAT_bf_delays(self):
         """Verify HBAT beamforming calculations are correctly executed"""
-        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True) as proxy:
+        with DeviceTestContext(recv.RECV, properties=self.recv_properties, process=True, timeout=10) as proxy:
             self.init_device(proxy)
             delays = numpy.random.rand(96,16).flatten()
             HBAT_bf_delays = proxy.calculate_HBAT_bf_delays(delays)