diff --git a/runtest.sh b/runtest.sh
index d8bd2ec..54897ec 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -167,7 +167,7 @@ for ((COUNTER = 1; COUNTER <= NUM_TESTS; COUNTER++)); do
     if [ "$LISTENER_ENABLED" -eq 1 ]; then
       LISTENER_SAMPLE_FILE="${TEST_FILE%.csv}-listener-$COUNTER-$i.csv"
 
-      log "Launching listener for sample $COUNTER/$i..."
+      log "Launching listener for sample $i/$NUM_TESTS..."
 
       READY_FILE="/tmp/listener_ready_${COUNTER}_${i}"
 
@@ -275,10 +275,13 @@ else
 fi
 
 ATTACHMENTS=()
-[ -f "$ENRICHED_FILE" ] && ATTACHMENTS+=("$ENRICHED_FILE")
+if [ "$LISTENER_ENABLED" -eq 1 ]; then
+  [ -n "$LISTENER_OUTFILE" ] && [ -f "$LISTENER_OUTFILE" ] && ATTACHMENTS+=("$LISTENER_OUTFILE")
+else
+  [ -f "$ENRICHED_FILE" ] && ATTACHMENTS+=("$ENRICHED_FILE")
+  [ -f "$SSID_METRICS_FILE" ] && ATTACHMENTS+=("$SSID_METRICS_FILE")
+fi
 [ -f "$FAILURE_LOG" ] && ATTACHMENTS+=("$FAILURE_LOG")
-[ -f "$SSID_METRICS_FILE" ] && ATTACHMENTS+=("$SSID_METRICS_FILE")
-[ -n "$LISTENER_OUTFILE" ] && [ -f "$LISTENER_OUTFILE" ] && ATTACHMENTS+=("$LISTENER_OUTFILE")
 
 if [ ${#ATTACHMENTS[@]} -eq 0 ]; then
   warn "No files to attach. Email not sent."