diff --git a/.gitignore b/.gitignore
index 1ab25d67f44..9cc35533baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,13 +3,12 @@
 *.mo
 *.pyc
 *.sqlite
+/.*
+!.coveragerc
+!.gitignore
+!.mailmap
+!.testr.conf
 .*.sw?
-.cinder-venv
-.coverage
-.testrepository
-.tox
-.venv
-.idea
 AUTHORS
 Authors
 build/*
@@ -30,8 +29,4 @@ tools/pylint_exceptions
 tags
 # Files created by Sphinx build
 doc/build
-.autogenerated
 
-# Development environment files
-.project
-.pydevproject