diff --git a/.gitignore b/.gitignore
index fd966d2cc..17f9cfa60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ js/external
 todo.org
 *~
 _build/
+/build/
 .merlin
 ._d/
 ._ncdi/
@@ -49,6 +50,11 @@ models/test_suite/error
 models/test_suite/*/*/output/profiling.txt
 models/test_suite/*/*/output/profiling.html
 models/test_suite/*/*/output/compression_status.txt
+/tests/integration/error
+/tests/integration/*/*/error
+# Ignore all test outputs except the reference files.
+/tests/integration/*/*/output/*
+!/tests/integration/*/*/output/*.ref
 
 tests/integration/*/*/output/*.xml
 tests/integration/*/*/output/*.html
@@ -83,7 +89,7 @@ site
 # python
 *.pyc
 dist/
-python/*.egg-info
+*.egg-info
 .idea
 
 # eclipse