diff --git a/tests/core/.gitignore b/tests/core/.gitignore
index 46bd7b8b..0df0dd3b 100644
--- a/tests/core/.gitignore
+++ b/tests/core/.gitignore
@@ -1,17 +1,22 @@
-audio
-collection
-database
-date
-driver
-file
-filter
-history
-idle
-index
-playlist
-queue
-random
-set
-string
-tempq
 version
+string
+random
+file
+date
+containers/set
+containers/database
+containers/index
+containers/queue
+filter
+idle
+tags/album
+tags/artist
+tags/genre
+tags/library
+tags/track
+queue
+playlist
+collection
+history
+tempq
+audio
diff --git a/tests/core/Sconscript b/tests/core/Sconscript
index e0909d82..290e100b 100644
--- a/tests/core/Sconscript
+++ b/tests/core/Sconscript
@@ -4,10 +4,12 @@ Import("env", "UnitTest", "testing_group")
 
 res = []
 core_objs = []
+ignore = open(".gitignore", "w")
 
 def CoreTest(name):
 	global core_objs
 
+	ignore.write("%s\n" % name)
 	source = "%s.c" % name.split("/")[-1]
 	test = os.path.abspath(source)
 	core = os.path.sep.join([x for x in test.split("/") if x != "tests"])
@@ -42,4 +44,5 @@ res += [ CoreTest("tempq")      ]
 core_objs += [ env.Object("../../core/core.c") ]
 res += [ CoreTest("audio")      ]
 
+ignore.close()
 Return("res")