diff --git a/distribution/packages/src/common/scripts/preinst b/distribution/packages/src/common/scripts/preinst
index a9e5295cbc56d..2aec2172ad856 100644
--- a/distribution/packages/src/common/scripts/preinst
+++ b/distribution/packages/src/common/scripts/preinst
@@ -27,6 +27,7 @@ case "$1" in
             adduser --quiet \
                     --system \
                     --no-create-home \
+                    --home /nonexistent \
                     --ingroup elasticsearch \
                     --disabled-password \
                     --shell /bin/false \
@@ -50,8 +51,9 @@ case "$1" in
         # Create elasticsearch user if not existing
         if ! id elasticsearch > /dev/null 2>&1 ; then
             echo -n "Creating elasticsearch user..."
-            useradd -r \
-                    -M \
+            useradd --system \
+                    --no-create-home \
+                    --home-dir /nonexistent \
                     --gid elasticsearch \
                     --shell /sbin/nologin \
                     --comment "elasticsearch user" \
diff --git a/qa/vagrant/src/test/resources/packaging/utils/packages.bash b/qa/vagrant/src/test/resources/packaging/utils/packages.bash
index a214cd6940f63..57f1ebd1c6106 100644
--- a/qa/vagrant/src/test/resources/packaging/utils/packages.bash
+++ b/qa/vagrant/src/test/resources/packaging/utils/packages.bash
@@ -88,6 +88,8 @@ verify_package_installation() {
     id elasticsearch
 
     getent group elasticsearch
+    # homedir is set in /etc/passwd but to a non existent directory
+    assert_file_not_exist $(getent passwd elasticsearch | cut -d: -f6)
 
     assert_file "$ESHOME" d root root 755
     assert_file "$ESHOME/bin" d root root 755