diff --git a/CakePHP.gitignore b/CakePHP.gitignore
index 55a665e..c6597e4 100644
--- a/CakePHP.gitignore
+++ b/CakePHP.gitignore
@@ -1,13 +1,25 @@
 # CakePHP 3
 
 /vendor/*
 /config/app.php
-/tmp/*
+
+/tmp/cache/models/*
+!/tmp/cache/models/empty
+/tmp/cache/persistent/*
+!/tmp/cache/persistent/empty
+/tmp/cache/views/*
+!/tmp/cache/views/empty
+/tmp/sessions/*
+!/tmp/sessions/empty
+/tmp/tests/*
+!/tmp/tests/empty
+
 /logs/*
+!/logs/empty
 
 # CakePHP 2
 
 /app/tmp/*
 /app/Config/core.php
 /app/Config/database.php
 /vendors/*