diff --git a/providers/base/units/suspend/suspend-graphics.pxu b/providers/base/units/suspend/suspend-graphics.pxu
index f2d536e20d..402ed23fc4 100644
--- a/providers/base/units/suspend/suspend-graphics.pxu
+++ b/providers/base/units/suspend/suspend-graphics.pxu
@@ -302,10 +302,10 @@ user: root
 command:
  if type -P fwts >/dev/null; then
   echo "Calling fwts"
-  set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log
+  set -o pipefail; checkbox-support-fwts_test -f none -l "$PLAINBOX_SESSION_SHARE"/{index}_suspend_30_cycles.log -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_30_cycles_times.log
  else
   echo "Calling sleep_test.py"
-  set -o pipefail; sleep_test.py -p | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_single_times.log
+  set -o pipefail; sleep_test.py -p | tee "$PLAINBOX_SESSION_SHARE"/{index}_suspend_30_cycles.log
  fi
 _purpose:
  Suspend SUT 30 times while using {product_slug} graphics card
diff --git a/providers/base/units/suspend/suspend.pxu b/providers/base/units/suspend/suspend.pxu
index 7e73de4df0..9977b28c56 100644
--- a/providers/base/units/suspend/suspend.pxu
+++ b/providers/base/units/suspend/suspend.pxu
@@ -193,7 +193,7 @@ command:
      fi
  else
      echo "Calling sleep_test.py"
-     set -o pipefail; sleep_test.py -p | tee "$PLAINBOX_SESSION_SHARE"/2_suspend_single_times.log
+     set -o pipefail; sleep_test.py -p | tee "$PLAINBOX_SESSION_SHARE"/suspend_single_times.log
  fi
 estimated_duration: 90.0
 _summary: Manual test of suspend function
@@ -1266,13 +1266,6 @@ command: audio_test.py
 _purpose: This will check to make sure that your audio device works properly after a suspend and resume. This may work fine with speakers and onboard microphone, however, it works best if used with a cable connecting the audio-out jack to the audio-in jack.
 _summary: Ensure audio device works correctly after suspend and resume cycle.
 
-plugin: attachment
-category_id: com.canonical.plainbox::suspend
-id: suspend/suspend-auto-single-log-attach
-command: [ -e "$PLAINBOX_SESSION_SHARE"/suspend_auto_single_log ] && cat "$PLAINBOX_SESSION_SHARE"/suspend_auto_single_log
-_purpose: Attaches the log from the single suspend/resume test to the results
-_summary: Attach the single suspend/resume test log to the results.
-
 plugin: shell
 category_id: com.canonical.plainbox::suspend
 id: suspend/gpu_lockup_after_suspend