diff --git a/.user.ini b/.user.ini
index 1dfba4acda8e0..87c4a930c7a47 100644
--- a/.user.ini
+++ b/.user.ini
@@ -2,6 +2,5 @@
 ; SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc.
 ; SPDX-License-Identifier: AGPL-3.0-only
 mbstring.func_overload=0
-always_populate_raw_post_data=-1
 default_charset='UTF-8'
 output_buffering=0
diff --git a/tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess b/tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess
index 1b5eb98b7f8ab..c6f50fcae511a 100644
--- a/tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess
+++ b/tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess
@@ -1,7 +1,6 @@
 # Start of valid file
 <IfModule mod_php7.c>
   php_value mbstring.func_overload 0
-  php_value always_populate_raw_post_data -1
   php_value default_charset 'UTF-8'
   php_value output_buffering 0
   <IfModule mod_env.c>
@@ -10,4 +9,4 @@
 </IfModule>
 #### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####
 
-# Content that should change the hash in the root folder
\ No newline at end of file
+# Content that should change the hash in the root folder
diff --git a/tests/data/setUploadLimit/htaccess b/tests/data/setUploadLimit/htaccess
deleted file mode 100644
index 53f743f45e777..0000000000000
--- a/tests/data/setUploadLimit/htaccess
+++ /dev/null
@@ -1,61 +0,0 @@
-# Version: 8.2.0
-<IfModule mod_headers.c>
-  <IfModule mod_fcgid.c>
-    <IfModule mod_setenvif.c>
-       SetEnvIfNoCase ^Authorization$ "(.+)" XAUTHORIZATION=$1
-       RequestHeader set XAuthorization %{XAUTHORIZATION}e env=XAUTHORIZATION
-    </IfModule>
-  </IfModule>
-
-  <IfModule mod_env.c>
-    # Add security and privacy related headers
-    Header set X-Content-Type-Options "nosniff"
-    Header set X-XSS-Protection "1; mode=block"
-    Header set X-Robots-Tag "noindex, nofollow"
-    Header set X-Frame-Options "SAMEORIGIN"
-    SetEnv modHeadersAvailable true
-  </IfModule>
-
-  # Add cache control for CSS and JS files
-  <FilesMatch "\.(css|js)$">
-    Header set Cache-Control "max-age=7200, public"
-  </FilesMatch>
-</IfModule>
-<IfModule mod_php7.c>
-php_value upload_max_filesize 513M
-php_value post_max_size 513M
-php_value memory_limit 512M
-php_value mbstring.func_overload 0
-php_value always_populate_raw_post_data -1
-php_value default_charset 'UTF-8'
-php_value output_buffering off
-<IfModule mod_env.c>
-  SetEnv htaccessWorking true
-</IfModule>
-</IfModule>
-<IfModule mod_rewrite.c>
-RewriteEngine on
-RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-RewriteRule ^\.well-known/host-meta /public.php?service=host-meta [QSA,L]
-RewriteRule ^\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L]
-RewriteRule ^\.well-known/webfinger /public.php?service=webfinger [QSA,L]
-RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R=301,L]
-RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R=301,L]
-RewriteRule ^apps/calendar/caldav\.php remote.php/caldav/ [QSA,L]
-RewriteRule ^apps/contacts/carddav\.php remote.php/carddav/ [QSA,L]
-RewriteRule ^remote/(.*) remote.php [QSA,L]
-RewriteRule ^(build|tests|config|lib|3rdparty|templates)/.* - [R=404,L]
-RewriteRule ^(\.|autotest|occ|issue|indie|db_|console).* - [R=404,L]
-</IfModule>
-<IfModule mod_mime.c>
-AddType image/svg+xml svg svgz
-AddEncoding gzip svgz
-</IfModule>
-<IfModule mod_dir.c>
-DirectoryIndex index.php index.html
-</IfModule>
-AddDefaultCharset utf-8
-Options -Indexes
-<IfModule pagespeed_module>
-  ModPagespeed Off
-</IfModule>
diff --git a/tests/data/setUploadLimit/user.ini b/tests/data/setUploadLimit/user.ini
deleted file mode 100644
index c5996e8d47e85..0000000000000
--- a/tests/data/setUploadLimit/user.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-upload_max_filesize=513M
-post_max_size=513M
-memory_limit=512M
-mbstring.func_overload=0
-always_populate_raw_post_data=-1
-default_charset='UTF-8'
-output_buffering=off