diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py
index 08e24499914f0303cf25028c1f230e0a2bdd08d0..3835ab5c16d99acd90e4128597f4bd63ac4d6c9d 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_antennafield.py
@@ -21,7 +21,7 @@ class TestAntennaFieldDevice(AbstractTestBases.TestDeviceBase):
         super().setUp("STAT/AntennaField/1")
         self.proxy.put_property({
             "RECV_devices": ["STAT/RECV/1"],
-            "Power_to_RECV_mapping": [1, 1, 1, 0] + [-1] * (MAX_ANTENNA - 4)
+            "Power_to_RECV_mapping": [1, 1, 1, 0] + [-1] * ((DEFAULT_N_HBA_TILES * 2) - 4)
         })
         self.recv_proxy = self.setup_recv_proxy()
         self.sdp_proxy = self.setup_sdp_proxy()
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py
index 49102ab0c2f3396ed9cc5e8e3a2a5acc63acbc3a..1ce23d972729bbac403313482db8f65e527cada9 100644
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py
+++ b/tangostationcontrol/tangostationcontrol/test/devices/test_recv_device.py
@@ -10,7 +10,7 @@
 from tango.test_context import DeviceTestContext
 
 from tangostationcontrol.devices import recv
-from tangostationcontrol.common.constants import MAX_ANTENNA, N_elements
+from tangostationcontrol.common.constants import N_rcu, N_rcu_inp, N_elements
 
 import numpy
 
@@ -29,7 +29,7 @@ class TestRecvDevice(device_base.DeviceTestCase):
     def test_calculate_HBAT_bf_delay_steps(self):
         """Verify HBAT beamforming calculations are correctly executed"""
         with DeviceTestContext(recv.RECV, properties=self.RECV_PROPERTIES, process=True) as proxy:
-            delays = numpy.random.rand(MAX_ANTENNA,N_elements).flatten()
+            delays = numpy.random.rand(N_rcu * N_rcu_inp,N_elements).flatten()
             HBAT_bf_delay_steps = proxy.calculate_HBAT_bf_delay_steps(delays)
             self.assertEqual(3072, len(HBAT_bf_delay_steps))                             # 96x32=3072