diff --git a/.drone.yml b/.drone.yml
index 75a65c33..3ec52a4d 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,6 +1,6 @@
 workspace:
   base: /var/www/owncloud
-  path: apps/encryption
+  path: server/apps/encryption
 
 branches: [master, release*, release/*]
 
@@ -8,6 +8,7 @@ pipeline:
   install-core:
     image: owncloudci/core
     version: ${OC_VERSION}
+    core_path: /var/www/owncloud/server
     pull: true
     exclude: "apps/encryption"
     db_type: ${DB_TYPE}
@@ -58,7 +59,7 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - cd /var/www/owncloud/
+      - cd /var/www/owncloud/server
       - php occ a:l
       - php occ a:e encryption
       - php occ a:e testing
@@ -77,9 +78,9 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - chown www-data /var/www/owncloud -R
-      - chmod 777 /var/www/owncloud/tests/acceptance/filesForUpload -R
-      - chmod +x /var/www/owncloud/tests/acceptance/run.sh
+      - chown www-data /var/www/owncloud/server -R
+      - chmod 777 /var/www/owncloud/server/tests/acceptance/filesForUpload -R
+      - chmod +x /var/www/owncloud/server/tests/acceptance/run.sh
     when:
       matrix:
         NEED_SERVER: true
@@ -89,7 +90,7 @@ pipeline:
     detach: true
     pull: true
     commands:
-      - tail -f /var/www/owncloud/data/owncloud.log
+      - tail -f /var/www/owncloud/server/data/owncloud.log
     when:
       matrix:
         NEED_SERVER: true
@@ -107,7 +108,7 @@ pipeline:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     commands:
-      - cd /var/www/owncloud
+      - cd /var/www/owncloud/server
       #- php ./occ app:check-code encryption -c private -c strong-comparison
       - php ./occ app:check-code encryption -c deprecation
     when:
@@ -119,7 +120,7 @@ pipeline:
     image: owncloudci/php:7.1
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phpstan
     when:
@@ -131,7 +132,7 @@ pipeline:
     image: owncloudci/php:7.0
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phan
     when:
@@ -143,7 +144,7 @@ pipeline:
     image: owncloudci/php:7.1
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phan
     when:
@@ -155,7 +156,7 @@ pipeline:
     image: owncloudci/php:7.2
     pull: true
     environment:
-      - COMPOSER_HOME=/var/www/owncloud/apps/password_policy/.cache/composer
+      - COMPOSER_HOME=/var/www/owncloud/server/apps/encryption/.cache/composer
     commands:
       - make test-php-phan
     when:
@@ -240,6 +241,21 @@ pipeline:
       matrix:
         TEST_SUITE: core-api-acceptance
 
+  core-api-acceptance-by-suite:
+    image: owncloudci/php:${PHP_VERSION}
+    pull: true
+    environment:
+      - TEST_SERVER_URL=http://owncloud
+      - MAILHOG_HOST=email
+      - BEHAT_SUITE=${BEHAT_SUITE}
+    commands:
+      - touch /var/www/owncloud/saved-settings.sh
+      - . /var/www/owncloud/saved-settings.sh
+      - make test-acceptance-core-api
+    when:
+      matrix:
+        TEST_SUITE: core-api-acceptance-by-suite
+
   codecov:
     image: plugins/codecov:2
     secrets: [codecov_token]
@@ -266,7 +282,7 @@ services:
     image: owncloudci/php:${PHP_VERSION}
     pull: true
     environment:
-      - APACHE_WEBROOT=/var/www/owncloud
+      - APACHE_WEBROOT=/var/www/owncloud/server
     command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ]
     when:
       matrix:
@@ -476,1692 +492,32 @@ matrix:
       DB_HOST: mysql
 
     ## UI core stable10 with masterkey encryption
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 1
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 2
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 3
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 4
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 5
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 6
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 7
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 8
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 9
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 10
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 11
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 12
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 13
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 14
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 15
-
-    ## UI core stable10 with user-keys encryption
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 1
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 2
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
+    ## API core master with user-keys encryption
+    - PHP_VERSION: 7.1
+      OC_VERSION: daily-master-qa
       NEED_CORE: true
       NEED_INSTALL_APP: true
       NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
       USE_FEDERATED_SERVER: true
       FEDERATION_OC_VERSION: daily-stable10-qa
       ENCRYPTION_TYPE: user-keys
       DB_TYPE: mysql
       DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 3
+      TEST_SUITE: core-api-acceptance
+      PART: 15
 
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
+    - PHP_VERSION: 7.1
+      OC_VERSION: daily-master-qa
       NEED_CORE: true
       NEED_INSTALL_APP: true
       NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
       USE_FEDERATED_SERVER: true
       FEDERATION_OC_VERSION: daily-stable10-qa
       ENCRYPTION_TYPE: user-keys
       DB_TYPE: mysql
       DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 4
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 5
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 6
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 7
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 8
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 9
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 10
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 11
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 12
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 13
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 14
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 15
-
-    ## UI core master with masterkey encryption
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 1
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 2
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 3
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 4
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 5
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 6
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 7
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 8
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 9
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 10
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 11
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 12
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 13
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 14
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 15
-
-    ## UI core master with user-keys encryption
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 1
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 2
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 3
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 4
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 5
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 6
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 7
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 8
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 9
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 10
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 11
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 12
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 13
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 14
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      NEED_SELENIUM: true
-      NEED_EMAIL: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-web-acceptance
-      PART: 15
-
-    ## API core stable10 with masterkey encryption
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 1
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 2
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 3
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 4
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 5
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 6
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 7
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 8
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 9
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 10
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 11
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 12
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 13
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 14
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 15
-
-    ## API core stable10 with user-keys encryption
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 1
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 2
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 3
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 4
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 5
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 6
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 7
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 8
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 9
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 10
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 11
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 12
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 13
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 14
-
-    - PHP_VERSION: 5.6
-      OC_VERSION: daily-stable10-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 15
-
-    ## API core master with masterkey encryption
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 1
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 2
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 3
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 4
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 5
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 6
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 7
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 8
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 9
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 10
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 11
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 12
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 13
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 14
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: masterkey
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 15
-
-    ## API core master with user-keys encryption
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 1
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 2
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 3
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 4
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 5
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 6
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 7
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 8
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 9
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 10
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 11
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 12
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 13
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 14
-
-    - PHP_VERSION: 7.1
-      OC_VERSION: daily-master-qa
-      NEED_CORE: true
-      NEED_INSTALL_APP: true
-      NEED_SERVER: true
-      USE_FEDERATED_SERVER: true
-      FEDERATION_OC_VERSION: daily-stable10-qa
-      ENCRYPTION_TYPE: user-keys
-      DB_TYPE: mysql
-      DB_HOST: mysql
-      TEST_SUITE: core-api-acceptance
-      PART: 15
+      TEST_SUITE: core-api-acceptance-by-suite
+      BEHAT_SUITE: apiWebdavProperties
 
     ## encryption WebUI acceptance tests user-keys encryption
     - PHP_VERSION: 7.1