diff --git a/.travis.yml b/.travis.yml
index 242ba71e39502f3e0c49a8e9db006ff863889f79..15413d3413eea8c5bfd4c2e9fc379ed35f187795 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@ install:
 
 script:
   - sh -c "if [ '$TC' = 'syntax' ]; then composer install && lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; fi"
+  - sh -c "if [ '$TC' = 'app:check-code' ]; then ./occ app:check-code admin_audit; ./occ app:check-code comments; ./occ app:check-code federation; fi"
   - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi"
   - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi"
 
@@ -51,5 +52,7 @@ matrix:
       env: DB=sqlite;TC=syntax;TEST_DAV=0
     - php: 7.0
       env: DB=sqlite;TC=syntax;TEST_DAV=0
+    - php: 5.4
+      env: DB=sqlite;TC=app:check-code;TEST_DAV=0
 
   fast_finish: true
diff --git a/apps/encryption/settings/settings-admin.php b/apps/encryption/settings/settings-admin.php
index 87de11bba0f64be2f43e17568034dedbc53db368..bca3d5168a0a348751fb2770633e7c6b46b6596a 100644
--- a/apps/encryption/settings/settings-admin.php
+++ b/apps/encryption/settings/settings-admin.php
@@ -22,8 +22,6 @@
  *
  */
 
-\OC_Util::checkAdminUser();
-
 $tmpl = new OCP\Template('encryption', 'settings-admin');
 
 $crypt = new \OCA\Encryption\Crypto\Crypt(
diff --git a/apps/federatedfilesharing/settings-admin.php b/apps/federatedfilesharing/settings-admin.php
index 33851129942aebc44ece347657bf618a47baf0a3..9875dcf3b5b8d27bc0a226ebfb8165d6f2bc7adf 100644
--- a/apps/federatedfilesharing/settings-admin.php
+++ b/apps/federatedfilesharing/settings-admin.php
@@ -22,8 +22,6 @@
 
 use OCA\FederatedFileSharing\AppInfo\Application;
 
-\OC_Util::checkAdminUser();
-
 $app = new Application('federatedfilesharing');
 $federatedShareProvider = $app->getFederatedShareProvider();
 
diff --git a/apps/federation/settings/settings-admin.php b/apps/federation/settings/settings-admin.php
index b5fd7710efcc775c1dc3bfada49cd64bfce9096e..4511ff954b52cf7bf3ebc763d08b14a01730fc44 100644
--- a/apps/federation/settings/settings-admin.php
+++ b/apps/federation/settings/settings-admin.php
@@ -19,8 +19,6 @@
  *
  */
 
-\OC_Util::checkAdminUser();
-
 $template = new OCP\Template('federation', 'settings-admin');
 
 $dbHandler = new \OCA\Federation\DbHandler(
diff --git a/apps/files/admin.php b/apps/files/admin.php
index 60f041a400b662d30655be13e3826c019c1fcec3..48a6100838f14e2dc7c3923c8cb803d7f38c4457 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -27,8 +27,6 @@
  *
  */
 
-OCP\User::checkAdminUser();
-
 $htaccessWorking=(getenv('htaccessWorking')=='true');
 $upload_max_filesize = OC::$server->getIniWrapper()->getBytes('upload_max_filesize');
 $post_max_size = OC::$server->getIniWrapper()->getBytes('post_max_size');
diff --git a/apps/files/download.php b/apps/files/download.php
index 38ac2a074c37781bb4bba55ef7f8a173cc6e2e52..da01f98ed6234700d2e109fd7585f8e932443429 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -26,9 +26,6 @@
  *
  */
 
-// Check if we are a user
-OCP\User::checkLoggedIn();
-
 $filename = $_GET["file"];
 
 if(!\OC\Files\Filesystem::file_exists($filename)) {
diff --git a/apps/files/list.php b/apps/files/list.php
index 6d2c463a2d9129a2eb45cd778c2a6665e7d89788..2d7a304df2426ff227ceb4259379c7a23164514d 100644
--- a/apps/files/list.php
+++ b/apps/files/list.php
@@ -20,9 +20,6 @@
  *
  */
 
-// Check if we are a user
-OCP\User::checkLoggedIn();
-
 $config = \OC::$server->getConfig();
 // TODO: move this to the generated config.js
 $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index e2c70062bf39f343d7429caba5e0e9c7b9da4ee5..24cd9cd9aebac34970d0b77f0b7b6f54137126f9 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -26,8 +26,6 @@
 
 use \OCA\Files_External\Service\BackendService;
 
-\OCP\User::checkAdminUser();
-
 // we must use the same container
 $appContainer = \OC_Mount_Config::$app->getContainer();
 $backendService = $appContainer->query('OCA\Files_External\Service\BackendService');
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index fb4d983517e9c56cc7c5eace566d8a0c57cf65fd..5c69b2ed961def868d63cce14e07d6e9e708912b 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -27,8 +27,6 @@
  *
  */
 
-OC_Util::checkAdminUser();
-
 // fill template
 $tmpl = new OCP\Template('user_ldap', 'settings');