diff --git a/config/application.config.php b/config/application.config.php
index 53de51f118e78b13a3bedb89f18f131d21f3a5be..4c4a5e3b401a57e3901168041db4495b3541b1a8 100644
--- a/config/application.config.php
+++ b/config/application.config.php
@@ -1,9 +1,9 @@
 <?php
 
 // Set up modules:
-$modules = array(
+$modules = [
     'ZfcRbac', 'VuFindTheme', 'VuFindSearch', 'VuFind', 'VuFindAdmin', 'VuFindApi'
-);
+];
 if (PHP_SAPI == 'cli' && !defined('VUFIND_PHPUNIT_RUNNING')) {
     $modules[] = 'VuFindConsole';
 }
@@ -53,24 +53,24 @@ if (!is_dir($cacheDir)) {
 $useCache = APPLICATION_ENV != 'development' && !defined('VUFIND_PHPUNIT_RUNNING');
 
 // Build configuration:
-return array(
+return [
     'modules' => array_unique($modules),
-    'module_listener_options' => array(
-        'config_glob_paths'    => array(
+    'module_listener_options' => [
+        'config_glob_paths'    => [
             'config/autoload/{,*.}{global,local}.php',
-        ),
+        ],
         'config_cache_enabled' => $useCache,
         'module_map_cache_enabled' => $useCache,
         'check_dependencies' => (APPLICATION_ENV == 'development'),
         'cache_dir'            => $cacheDir,
-        'module_paths' => array(
+        'module_paths' => [
             './module',
             './vendor',
-        ),
-    ),
-    'service_manager' => array(
+        ],
+    ],
+    'service_manager' => [
         'use_defaults' => true,
-        'factories'    => array(
-        ),
-    ),
-);
+        'factories'    => [
+        ],
+    ],
+];
diff --git a/config/autoload/global.php b/config/autoload/global.php
index b03c0c4f9b70336e51936a78a2d37884a62cdc6f..5ce1434a77848f6891552c00fd995660f9429a8f 100644
--- a/config/autoload/global.php
+++ b/config/autoload/global.php
@@ -2,15 +2,15 @@
 /**
  * Global Configuration Override
  *
- * You can use this file for overridding configuration values from modules, etc.  
- * You would place values in here that are agnostic to the environment and not 
- * sensitive to security. 
+ * You can use this file for overridding configuration values from modules, etc.
+ * You would place values in here that are agnostic to the environment and not
+ * sensitive to security.
  *
- * @NOTE: In practice, this file will typically be INCLUDED in your source 
- * control, so do not include passwords or other sensitive information in this 
+ * @NOTE: In practice, this file will typically be INCLUDED in your source
+ * control, so do not include passwords or other sensitive information in this
  * file.
  */
 
-return array(
+return [
     // ...
-);
+];
diff --git a/public/index.php b/public/index.php
index 6967aaf957aeee755527c2d756ee1e77c3a4a29a..5282d0e679d783927f3dbe042e70c12b225f695f 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,14 +1,12 @@
 <?php
 use Zend\Loader\AutoloaderFactory;
-use Zend\ServiceManager\ServiceManager;
-use Zend\Mvc\Service\ServiceManagerConfig;
 
 // If the XHProf profiler is enabled, set it up now:
 $xhprof = getenv('VUFIND_PROFILER_XHPROF');
 if (!empty($xhprof)) {
     if (extension_loaded('xhprof')) {
         xhprof_enable();
-    } else if (extension_loaded('tideways')) {
+    } elseif (extension_loaded('tideways')) {
         tideways_enable();
     } else {
         $xhprof = false;
@@ -57,7 +55,7 @@ chdir(APPLICATION_PATH);
 // Ensure vendor/ is on include_path; some PEAR components may not load correctly
 // otherwise (i.e. File_MARC may cause a "Cannot redeclare class" error by pulling
 // from the shared PEAR directory instead of the local copy):
-$pathParts = array();
+$pathParts = [];
 $pathParts[] = APPLICATION_PATH . '/vendor';
 $pathParts[] = get_include_path();
 set_include_path(implode(PATH_SEPARATOR, $pathParts));
diff --git a/tests/vufind.php_cs b/tests/vufind.php_cs
index aff0b9e402c95d20de30f484a51adb882325d1d2..a5f7e3f6975a056d9add81466d5943363188d2a5 100644
--- a/tests/vufind.php_cs
+++ b/tests/vufind.php_cs
@@ -1,6 +1,9 @@
 <?php
 
-$finder = PhpCsFixer\Finder::create()->in(__DIR__ . '/../module');
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__ . '/../config')
+    ->in(__DIR__ . '/../module')
+    ->in(__DIR__ . '/../public');
 
 $rules = [
     'align_multiline_comment' => true,