diff --git a/tests/core/Sconscript b/tests/core/Sconscript
index bd0fceaa..ed56c35b 100644
--- a/tests/core/Sconscript
+++ b/tests/core/Sconscript
@@ -23,7 +23,11 @@ res += [ CoreTest("random",   "random.c")     ]
 res += [ CoreTest("file",     "file.c")       ]
 res += [ CoreTest("date",     "date.c")       ]
 
-res += SConscript("containers/Sconscript")
+tmp = SConscript("containers/Sconscript")
+if testing_group(["tests/core"]):
+	Depends(tmp[0], res[-1])
+res += tmp
+
 res += [ CoreTest("filter",   "filter.c")     ]
 res += [ CoreTest("idle",     "idle.c")       ]
 
diff --git a/tests/core/containers/Sconscript b/tests/core/containers/Sconscript
index cd05f177..5a5b65c6 100644
--- a/tests/core/containers/Sconscript
+++ b/tests/core/containers/Sconscript
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 import os
-Import("env", "UnitTest", "core_objs")
+Import("env", "UnitTest", "core_objs", "testing_group")
+
+res = []
 
 def ContainerTest(name, source):
 	global core_objs
@@ -9,10 +11,12 @@ def ContainerTest(name, source):
 	run = UnitTest("core/containers/%s" % name, [ source ] + core_objs)
 	Alias("tests/core", run)
 	Alias("tests/core/containers", run)
+	if len(res) > 0 and testing_group(["tests/core", "tests/core/containers"]):
+		Depends(run, res[-1])
 	return run
 
-res  = [ ContainerTest("set",      "set.c")      ]
-res  = [ ContainerTest("database", "database.c") ]
+res += [ ContainerTest("set",      "set.c")      ]
+res += [ ContainerTest("database", "database.c") ]
 res += [ ContainerTest("index",    "index.c")    ]
 res += [ ContainerTest("queue",    "queue.c")    ]