diff --git a/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
index e2b70eb..23a4b68 100644
--- a/lava_helper/jinja2_templates/fvp_mps2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -38,6 +38,7 @@
       minutes: 5
     console_string: 'telnetterminal0: Listening for serial connection on port (?P<PORT>\d+)'
     license_variable: '{{ license_variable }}'
+    use_telnet: False
     arguments:
     -  "--application cpu0={NS}"
     -  "--data cpu0={S}@{{ data_bin_offset }}"
@@ -53,6 +54,7 @@
     -  "--parameter fvp_mps2.telnetterminal1.quiet=0"
     -  "--parameter fvp_mps2.telnetterminal2.quiet=0"
     -  "--parameter fvp_mps2.UART0.shutdown_on_eot=1"
+    -  "--parameter 'fvp_mps2.UART0.out_file=-'"
     -  "--parameter fvp_mps2.mps2_visualisation.disable-visualisation=1"
     prompts:
     - '(.*)'
diff --git a/tfm_ci_pylib/lava_rpc_connector.py b/tfm_ci_pylib/lava_rpc_connector.py
index a0255d8..d954d64 100644
--- a/tfm_ci_pylib/lava_rpc_connector.py
+++ b/tfm_ci_pylib/lava_rpc_connector.py
@@ -149,6 +149,19 @@
                 print(E)
             return False
 
+    def device_type_from_def(self, job_data):
+        def_yaml = yaml.load(job_data)
+        return(def_yaml['device_type'])
+
+    def has_device_type(self, job_data):
+        d_type = self.device_type_from_def(job_data)
+        all_d = self.scheduler.devices.list()
+        for device in all_d:
+            if device['type'] == d_type:
+                if device['health'] in ['Good', 'Unknown']:
+                    return(True)
+        return(False)
+
     def submit_job(self, job_definition):
         """ Will submit a yaml definition pointed by job_definition after
         validating it againist the remote backend. Returns resulting job id,