diff --git a/hana/lib/scripts/container-database.sql b/hana/lib/scripts/container-database.sql
index e3a5b237b..c2b557ffd 100644
--- a/hana/lib/scripts/container-database.sql
+++ b/hana/lib/scripts/container-database.sql
@@ -39,6 +39,8 @@ BEGIN SEQUENTIAL EXECUTION
     END IF;
     IF :USER_EXISTS = 0 THEN
       EXEC 'CREATE USER ' || :USERNAME || ' PASSWORD ' || :USERPASS || ' NO FORCE_FIRST_PASSWORD_CHANGE SET USERGROUP "' || :SCHEMANAME || '_USERS"';
+    ELSE 
+      EXEC 'ALTER USER ' || :USERNAME || ' DISABLE PASSWORD LIFETIME';
     END IF;
     EXEC 'GRANT ' || :OPERATOR_ROLE || ' ON USERGROUP "' || :SCHEMANAME || '_USERS" TO ' || :USERNAME;
     EXEC 'GRANT EXECUTE ON SYS.GET_INSUFFICIENT_PRIVILEGE_ERROR_DETAILS TO ' || :USERNAME || ' WITH GRANT OPTION';
diff --git a/test/cds.js b/test/cds.js
index f003d482c..071a8b1b0 100644
--- a/test/cds.js
+++ b/test/cds.js
@@ -45,6 +45,7 @@ cds.test = Object.setPrototypeOf(function () {
     } catch {
       // Default to sqlite for packages without their own service
       cds.env.requires.db = require('@cap-js/sqlite/test/service')
+      require('@cap-js/sqlite/cds-plugin')
     }
   })