diff --git a/tests/api/feeds.bats b/tests/api/feeds.bats
index 99c37b90e2..845a18eda8 100644
--- a/tests/api/feeds.bats
+++ b/tests/api/feeds.bats
@@ -7,8 +7,7 @@ setup_file(){
     load "helpers/settings-override"
   fi
 
-  export APP_PASSWORD=$(http --ignore-stdin -b -a ${user}:${user} GET ${NC_HOST}/ocs/v2.php/core/getapppassword OCS-APIRequest:true | grep -Po '<apppassword>\K([A-Z|0-9|a-z]+)[^<\/apppassword>]')
-  sleep 2
+  export APP_PASSWORD=$(NC_PASS=${user} ./occ user:add-app-password ${user} --password-from-env | grep -Po '([A-Z|a-z|0-9]{72})')
 }
 
 teardown_file(){
@@ -38,7 +37,7 @@ teardown() {
 
 @test "[$TESTSUITE] Read empty" {
   run http --ignore-stdin -b -a ${user}:${APP_PASSWORD} GET ${BASE_URLv1}/feeds
-  
+
   assert_output --partial "\"feeds\":[]"
   assert_output --partial "\"starredCount\":0"
 }
diff --git a/tests/api/folders.bats b/tests/api/folders.bats
index fb32560f27..77f23814f3 100644
--- a/tests/api/folders.bats
+++ b/tests/api/folders.bats
@@ -7,8 +7,7 @@ setup_file(){
     load "helpers/settings-override"
   fi
 
-  export APP_PASSWORD=$(http --ignore-stdin -b -a ${user}:${user} GET ${NC_HOST}/ocs/v2.php/core/getapppassword OCS-APIRequest:true | grep -Po '<apppassword>\K([A-Z|0-9|a-z]+)[^<\/apppassword>]')
-  sleep 2
+  export APP_PASSWORD=$(NC_PASS=${user} ./occ user:add-app-password ${user} --password-from-env | grep -Po '([A-Z|a-z|0-9]{72})')
 }
 
 teardown_file(){
diff --git a/tests/api/items.bats b/tests/api/items.bats
index 043c402fd9..d6896785f7 100644
--- a/tests/api/items.bats
+++ b/tests/api/items.bats
@@ -7,8 +7,7 @@ setup_file(){
     load "helpers/settings-override"
   fi
 
-  export APP_PASSWORD=$(http --ignore-stdin -b -a ${user}:${user} GET ${NC_HOST}/ocs/v2.php/core/getapppassword OCS-APIRequest:true | grep -Po '<apppassword>\K([A-Z|0-9|a-z]+)[^<\/apppassword>]')
-  sleep 2
+  export APP_PASSWORD=$(NC_PASS=${user} ./occ user:add-app-password ${user} --password-from-env | grep -Po '([A-Z|a-z|0-9]{72})')
 }
 
 teardown_file(){