diff --git a/changelog/64141.fixed.md b/changelog/64141.fixed.md
new file mode 100644
index 000000000000..62c3e8f90c16
--- /dev/null
+++ b/changelog/64141.fixed.md
@@ -0,0 +1 @@
+Make salt user's home /opt/saltstack/salt
diff --git a/changelog/64158.fixed.md b/changelog/64158.fixed.md
new file mode 100644
index 000000000000..a31abbfe0232
--- /dev/null
+++ b/changelog/64158.fixed.md
@@ -0,0 +1 @@
+Salt minion runs with salt group permissions
diff --git a/pkg/tests/integration/test_salt_user.py b/pkg/tests/integration/test_salt_user.py
index 374004178f3b..8265e15fbd72 100644
--- a/pkg/tests/integration/test_salt_user.py
+++ b/pkg/tests/integration/test_salt_user.py
@@ -28,7 +28,7 @@ def test_salt_user_home(install_salt):
     """
     Test the correct user is running the Salt Master
     """
-    proc = subprocess.run(["getent", "salt"], check=False, capture_output=True)
+    proc = subprocess.run(["getent", "passwd", "salt"], check=False, capture_output=True)
     assert proc.returncode == 0
     home = ""
     try: