diff --git a/.gitignore b/.gitignore
index 0d34b4b5dac373bf45b20c927fc21c410423241d..706d03393e2f3ec8af929f427bc2148d5bdc6883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,7 @@
 ChangeLog
 \#*
 .\#*
-.php_cs.cache
-.php_cs_template.cache
+.php_cs_cache
 TAGS
 *~
 /downloads
@@ -14,4 +13,4 @@ composer.phar
 import/solrmarc.log
 node_modules
 public/swagger-ui
-.vagrant
\ No newline at end of file
+.vagrant
diff --git a/.travis.yml b/.travis.yml
index 857f8d33a7cedbf3ee43a4c268af34cac2fe2809..1006959fc5855919a695461fbded04d6816fcbed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@ before_script:
 cache:
   directories:
     - downloads
+    - .php_cs_cache
     - $HOME/.composer/cache/files
 
 script:
diff --git a/tests/vufind.php_cs b/tests/vufind.php_cs
index d154d57a69bf634fac3325117bbd2492a4120086..9784b03026237c7c46cb45b861b496f62db1d824 100644
--- a/tests/vufind.php_cs
+++ b/tests/vufind.php_cs
@@ -65,6 +65,12 @@ $rules = [
     'visibility_required' => true,
 ];
 
+$cacheDir = __DIR__ . '/../.php_cs_cache';
+if (!is_dir($cacheDir)) {
+    mkdir($cacheDir);
+}
+
 return PhpCsFixer\Config::create()
+    ->setCacheFile($cacheDir . '/.code.cache')
     ->setRules($rules)
     ->setFinder($finder);
diff --git a/tests/vufind_templates.php_cs b/tests/vufind_templates.php_cs
index 8cb5bd0b3e9defbecc2a34de741992c231eafe69..a4db59e505148aa48912181b4df7db9523bb5d82 100644
--- a/tests/vufind_templates.php_cs
+++ b/tests/vufind_templates.php_cs
@@ -62,7 +62,12 @@ $rules = [
     'visibility_required' => true,
 ];
 
+$cacheDir = __DIR__ . '/../.php_cs_cache';
+if (!is_dir($cacheDir)) {
+    mkdir($cacheDir);
+}
+
 return PhpCsFixer\Config::create()
-    ->setCacheFile(__DIR__ . '/../.php_cs_template.cache')
+    ->setCacheFile($cacheDir . '/.template.cache')
     ->setRules($rules)
     ->setFinder($finder);