diff --git a/cmd/snap/cmd_run.go b/cmd/snap/cmd_run.go
index b9c97af527e..5143debdd04 100644
--- a/cmd/snap/cmd_run.go
+++ b/cmd/snap/cmd_run.go
@@ -39,6 +39,7 @@ import (
 	"github.com/jessevdk/go-flags"
 
 	"github.com/snapcore/snapd/client"
+	"github.com/snapcore/snapd/dbusutil"
 	"github.com/snapcore/snapd/dirs"
 	"github.com/snapcore/snapd/i18n"
 	"github.com/snapcore/snapd/interfaces"
@@ -720,7 +721,7 @@ func activateXdgDocumentPortal(info *snap.Info, snapApp, hook string) error {
 		return nil
 	}
 
-	conn, err := dbus.SessionBus()
+	conn, err := dbusutil.SessionBus()
 	if err != nil {
 		return err
 	}
diff --git a/sandbox/cgroup/export_test.go b/sandbox/cgroup/export_test.go
index 4e6b9b530dc..7afd5d6e447 100644
--- a/sandbox/cgroup/export_test.go
+++ b/sandbox/cgroup/export_test.go
@@ -23,12 +23,12 @@ import (
 )
 
 var (
-	Cgroup2SuperMagic  = cgroup2SuperMagic
-	ProbeCgroupVersion = probeCgroupVersion
-	ParsePid           = parsePid
-
+	Cgroup2SuperMagic       = cgroup2SuperMagic
+	ProbeCgroupVersion      = probeCgroupVersion
+	ParsePid                = parsePid
 	DoCreateTransientScope  = doCreateTransientScope
 	SessionOrMaybeSystemBus = sessionOrMaybeSystemBus
+
 	ErrDBusUnknownMethod    = errDBusUnknownMethod
 	ErrDBusNameHasNoOwner   = errDBusNameHasNoOwner
 	ErrDBusSpawnChildExited = errDBusSpawnChildExited
diff --git a/tests/lib/snaps/test-snapd-tools-core18/bin/cmd b/tests/lib/snaps/test-snapd-tools-core18/bin/cmd
index bca8793d2b2..e55f49a5a09 100755
--- a/tests/lib/snaps/test-snapd-tools-core18/bin/cmd
+++ b/tests/lib/snaps/test-snapd-tools-core18/bin/cmd
@@ -3,4 +3,4 @@ PS1='$ '
 command="$1"
 shift
 
-"$command" "$@"
+exec "$command" "$@"
diff --git a/tests/lib/snaps/test-snapd-tools/bin/cmd b/tests/lib/snaps/test-snapd-tools/bin/cmd
index bca8793d2b2..e55f49a5a09 100755
--- a/tests/lib/snaps/test-snapd-tools/bin/cmd
+++ b/tests/lib/snaps/test-snapd-tools/bin/cmd
@@ -3,4 +3,4 @@ PS1='$ '
 command="$1"
 shift
 
-"$command" "$@"
+exec "$command" "$@"