diff --git a/shared/util_linux.go b/shared/util_linux.go
index 17288ac5e353..e1ddbb0689d5 100644
--- a/shared/util_linux.go
+++ b/shared/util_linux.go
@@ -13,6 +13,7 @@ import (
 	"path/filepath"
 	"reflect"
 	"strings"
+	"syscall"
 	"time"
 	"unsafe"
 
@@ -397,7 +398,7 @@ func ExitStatus(err error) (int, error) {
 	// Detect and extract ExitError to check the embedded exit status.
 	if errors.As(err, &exitErr) {
 		// If the process was signaled, extract the signal.
-		status, isWaitStatus := exitErr.Sys().(unix.WaitStatus)
+		status, isWaitStatus := exitErr.Sys().(syscall.WaitStatus)
 		if isWaitStatus && status.Signaled() {
 			return 128 + int(status.Signal()), nil // 128 + n == Fatal error signal "n"
 		}
diff --git a/test/suites/exec.sh b/test/suites/exec.sh
index 215f95a305e4..2b9b1eb4446d 100644
--- a/test/suites/exec.sh
+++ b/test/suites/exec.sh
@@ -93,19 +93,25 @@ test_exec_exit_code() {
   lxc exec x1 -- invalid-command || exitCode=$?
   [ "${exitCode:-0}" -eq 127 ]
 
-  # Try disconnecting a container stopping forcefully and gracefully to make sure they differ appropriately.
-  (sleep 1 && lxc stop -f x1) &
-  lxc exec x1 -- sleep 10 || exitCode=$?
+  # Signaling the process spawned by lxc exec and checking its exit code.
+  # Simulates what can happen if the container stops in the middle of lxc exec.
+  (sleep 5 && lxc exec x1 -- killall -s SIGTERM sleep) &
+  lxc exec x1 -- sleep 60 || exitCode=$?
+  [ "${exitCode:-0}" -eq 143 ] # 128 + 15(SIGTERM)
+
+  (sleep 5 && lxc exec x1 -- killall -s SIGHUP sleep) &
+  lxc exec x1 -- sleep 60 || exitCode=$?
+  [ "${exitCode:-0}" -eq 129 ] # 128 + 1(SIGHUP)
+
+  (sleep 5 && lxc exec x1 -- killall -s SIGKILL sleep) &
+  lxc exec x1 -- sleep 60 || exitCode=$?
+  [ "${exitCode:-0}" -eq 137 ] # 128 + 9(SIGKILL)
+
+  # Try disconnecting a container stopping forcefully.
+  (sleep 5 && lxc stop -f x1) &
+  lxc exec x1 -- sleep 60 || exitCode=$?
   [ "${exitCode:-0}" -eq 137 ]
-
   wait $!
-  lxc start x1
-  sleep 2
-  (sleep 1 && lxc stop x1) &
-  lxc exec x1 -- sleep 10 || exitCode=$?
-  # Both 129 and 143 have been seen and both make sense here.
-  [ "${exitCode:-0}" -eq 129 ] || [ "${exitCode:-0}" -eq 143 ]
 
-  wait $!
   lxc delete --force x1
 }