diff --git a/.gitignore b/.gitignore
index 8e575ed77..b6a68d446 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,6 @@
 log/*
 .bundle
-test/*
-tmp/bids/server.pid
-tmp/*
-/tmp/cache/*
-/tmp/pdf/*
-/tmp/sessions/*
-/tmp/sockets/*
-/tmp/test/*
-/tmp/thumbnails/*
+tmp/pids/server.pid
 .project
 .svn/
 .git/
@@ -16,5 +8,3 @@ tmp/*
 log
 /log/development.log
 /log/development.scm.stderr.log
-/log/delete.me
-/test/*