diff --git a/managed/services/supervisord/supervisord_test.go b/managed/services/supervisord/supervisord_test.go
index 8092666727..079d30a5b0 100644
--- a/managed/services/supervisord/supervisord_test.go
+++ b/managed/services/supervisord/supervisord_test.go
@@ -100,7 +100,7 @@ func TestAddAlertManagerParam(t *testing.T) {
 		require.NoError(t, err)
 		require.Equal(t, "http://127.0.0.1:9093/alertmanager,https://some-alertmanager", params["AlertmanagerURL"])
 		require.Equal(t, ",username1", params["AlertManagerUser"])
-		require.Equal(t, `,"PAsds!234"`, params["AlertManagerPassword"])
+		require.Equal(t, `,"PAsds!234"`, params["ATestSavePMMConfiglertManagerPassword"])
 	})
 
 	t.Run("incorrect alertmanager url", func(t *testing.T) {
diff --git a/managed/testdata/supervisord.d/pmm-db_disabled.ini b/managed/testdata/supervisord.d/pmm-db_disabled.ini
index b45251ab1f..341bafd9f8 100644
--- a/managed/testdata/supervisord.d/pmm-db_disabled.ini
+++ b/managed/testdata/supervisord.d/pmm-db_disabled.ini
@@ -43,6 +43,7 @@ redirect_stderr = true
 [program:nginx]
 priority = 4
 command = nginx
+user = nginx
 autorestart = true
 autostart = true
 startretries = 10
diff --git a/managed/testdata/supervisord.d/pmm-db_enabled.ini b/managed/testdata/supervisord.d/pmm-db_enabled.ini
index 4d4ad4afd9..7fdbfba722 100644
--- a/managed/testdata/supervisord.d/pmm-db_enabled.ini
+++ b/managed/testdata/supervisord.d/pmm-db_enabled.ini
@@ -67,6 +67,7 @@ redirect_stderr = true
 [program:nginx]
 priority = 4
 command = nginx
+user = nginx
 autorestart = true
 autostart = true
 startretries = 10