diff --git a/overlay/opt/emcomm-tools/bin/et-fldigi b/overlay/opt/emcomm-tools/bin/et-fldigi
index 2356553..70d0e52 100755
--- a/overlay/opt/emcomm-tools/bin/et-fldigi
+++ b/overlay/opt/emcomm-tools/bin/et-fldigi
@@ -76,19 +76,19 @@ update-config () {
     et-portaudio 2>/dev/null > ${PORT_AUDIO_CONF}
 
     if [[ $? -ne 0 ]]; then
-      echo "No supported ET_AUDIO device found"
+      et-log "No supported ET_AUDIO device found"
       exit 1
     fi
 
     DEVICE=$(jq -r -e '.device' ${PORT_AUDIO_CONF})
     if [[ $? -ne 0 ]]; then
-      echo "Error getting PulseAudio device name for ET_AUDIO device"
+      et-log "Error getting PulseAudio device name for ET_AUDIO device"
       exit 1
     fi
 
     INDEX=$(jq -r -e '.index' ${PORT_AUDIO_CONF})
     if [[ $? -ne 0 ]]; then
-      echo "Error getting PulseAudio device index for ET_AUDIO device"
+      et-log "Error getting PulseAudio device index for ET_AUDIO device"
       exit 1
     fi
 
diff --git a/overlay/opt/emcomm-tools/bin/et-kill-all b/overlay/opt/emcomm-tools/bin/et-kill-all
index 3ecc77d..ed0b8b3 100755
--- a/overlay/opt/emcomm-tools/bin/et-kill-all
+++ b/overlay/opt/emcomm-tools/bin/et-kill-all
@@ -33,10 +33,6 @@ stop_all_services() {
   pkill et-vara
   pkill VARA 
 
-  # Stop fldigi
-  pkill fldigi
-  pkill et-fldigi
-
   stop_pat
 }
 
diff --git a/scripts/install-fldigi.sh b/scripts/install-fldigi.sh
index ae38643..6c4e4ce 100755
--- a/scripts/install-fldigi.sh
+++ b/scripts/install-fldigi.sh
@@ -37,12 +37,13 @@ make
 # Install
 make install
 
-# Use wrapper script as launcher executable
-sed -i 's|^Exec.*|Exec=/opt/emcomm-tools/bin/et-fldigi start|' /opt/fldigi/share/applications/fldigi.desktop
-
 [[ -e ${LINK_PATH} ]] && rm ${LINK_PATH}
 ln -v -s ${INSTALL_DIR} ${LINK_PATH}
 
 stow -v -d /opt ${APP} -t /usr/local
 
 cd ${CWD}
+
+# Use wrapper script as launcher executable
+sed -i 's|^Exec.*|Exec=/opt/emcomm-tools/bin/et-fldigi start|' /opt/fldigi/share/applications/fldigi.desktop
+
diff --git a/tests/test-fldigi.sh b/tests/test-fldigi.sh
new file mode 100755
index 0000000..8cb4197
--- /dev/null
+++ b/tests/test-fldigi.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Author   : Gaston Gonzalez
+# Date     : 2 October 2025
+# Purpose  : Test fldigi installation
+
+OUT=$(which fldigi)
+exit $?