diff --git a/src/osmo_gsm_tester/amarisoft_enb.py b/src/osmo_gsm_tester/amarisoft_enb.py
index 79b90a7..5b4e99e 100644
--- a/src/osmo_gsm_tester/amarisoft_enb.py
+++ b/src/osmo_gsm_tester/amarisoft_enb.py
@@ -82,7 +82,9 @@
 
     def bin_prefix(self):
         if self._bin_prefix is None:
-            self._bin_prefix = os.getenv('AMARISOFT_PATH_ENB', AmarisoftENB.REMOTE_DIR)
+            self._bin_prefix = os.getenv('AMARISOFT_PATH_ENB', None)
+            if self._bin_prefix == None:
+                self._bin_prefix  = self.suite_run.trial.get_inst('amarisoftenb')
         return self._bin_prefix
 
     def cleanup(self):
diff --git a/src/osmo_gsm_tester/amarisoft_epc.py b/src/osmo_gsm_tester/amarisoft_epc.py
index eb9be94..c1f341c 100644
--- a/src/osmo_gsm_tester/amarisoft_epc.py
+++ b/src/osmo_gsm_tester/amarisoft_epc.py
@@ -56,7 +56,9 @@
 
     def bin_prefix(self):
         if self._bin_prefix is None:
-            self._bin_prefix = os.getenv('AMARISOFT_PATH_EPC', AmarisoftEPC.REMOTE_DIR)
+            self._bin_prefix = os.getenv('AMARISOFT_PATH_EPC', None)
+            if self._bin_prefix == None:
+                self._bin_prefix  = self.suite_run.trial.get_inst('amarisoftepc')
         return self._bin_prefix
 
     def cleanup(self):