diff --git a/src/common/test/SConstruct b/src/common/test/SConstruct
index f5945c6847..fc5564ef47 100644
--- a/src/common/test/SConstruct
+++ b/src/common/test/SConstruct
@@ -59,6 +59,6 @@ main_env.Append(CPPFLAGS=[
 # Linking flags
 main_env.Append(LDFLAGS=["-g"])
 
-main_env.Program('single_attribute.cc')
-main_env.Program('vector_attribute.cc')
-main_env.Program('action_manager.cc')
+main_env.Program('test_sa','single_attribute.cc')
+main_env.Program('test_va','vector_attribute.cc')
+main_env.Program('test_am','action_manager.cc')
diff --git a/src/host/test/SConstruct b/src/host/test/SConstruct
index d290f4a63e..996c5fe4f0 100644
--- a/src/host/test/SConstruct
+++ b/src/host/test/SConstruct
@@ -60,7 +60,7 @@ main_env.Append(LIBS=[
     'mysqlclient',
 ])
 
-# MYSQL, puesto a mano
+# MYSQL
 main_env.Append(LIBPATH=["/usr/lib/mysql"])
 main_env.Append(CPPPATH=["/usr/include/mysql"])
 
@@ -73,5 +73,5 @@ main_env.Append(CPPFLAGS=[
 # Linking flags
 main_env.Append(LDFLAGS=["-g "])
 
-main_env.Program('HostPoolTest.cc')
+main_env.Program('test','HostPoolTest.cc')
 
diff --git a/src/pool/test/SConstruct b/src/pool/test/SConstruct
index 7f10456439..623f8b81b9 100644
--- a/src/pool/test/SConstruct
+++ b/src/pool/test/SConstruct
@@ -42,11 +42,13 @@ main_env.Append(LIBPATH=[
     cwd + '/src/common',
     cwd + '/src/pool',
     cwd + '/src/pool/test',
+    cwd + '/src/nebula',
 ])
 
 main_env.Append(LIBS=[
     'nebula_pool',
     'nebula_common',
+    'nebula_core',
     'cppunit',
     'dl',
     'pthread',
@@ -64,5 +66,5 @@ main_env.Append(CPPFLAGS=[
 main_env.Append(LDFLAGS=["-g "])
 
 main_env.StaticLibrary('test_object', ['TestPoolSQL.cc', 'TestPoolSQL.h'])
-main_env.Program('pool.cc')
+main_env.Program('test','pool.cc')
 #
diff --git a/src/template/test/SConstruct b/src/template/test/SConstruct
index 77a572f3e1..310e310ae2 100644
--- a/src/template/test/SConstruct
+++ b/src/template/test/SConstruct
@@ -42,11 +42,13 @@ main_env.Append(CPPPATH=[
 main_env.Append(LIBPATH=[
     cwd + '/src/common',
     cwd + '/src/template',
+    cwd + '/src/nebula',
 ])
 
 main_env.Append(LIBS=[
     'nebula_template',
     'nebula_common',
+    'nebula_core',
     'cppunit',
     'dl',
     'pthread',
@@ -62,6 +64,6 @@ main_env.Append(CPPFLAGS=[
 # Linking flags
 main_env.Append(LDFLAGS=["-g "])
 
-main_env.Program('template.cc')
-main_env.Program('template_sql.cc')
+main_env.Program('test','template.cc')
+main_env.Program('test_sql','template_sql.cc')
 #
diff --git a/src/um/test/SConstruct b/src/um/test/SConstruct
index 3ef43735af..3baad58bab 100644
--- a/src/um/test/SConstruct
+++ b/src/um/test/SConstruct
@@ -68,7 +68,7 @@ main_env.Append(CPPFLAGS=[
 
 # Linking flags
 main_env.Append(LDFLAGS=["-g "])
-main_env.Program('UserPoolTest.cc')
+main_env.Program('test','UserPoolTest.cc')
 
 # MYSQL
 main_env.Append(LIBPATH=["/usr/lib/mysql"])
diff --git a/src/vm/test/SConstruct b/src/vm/test/SConstruct
index ee8c037638..648b07581b 100644
--- a/src/vm/test/SConstruct
+++ b/src/vm/test/SConstruct
@@ -83,5 +83,5 @@ main_env.Append(CPPFLAGS=[
 # Linking flags
 main_env.Append(LDFLAGS=["-g "])
 
-main_env.Program('VirtualMachinePoolTest.cc')
+main_env.Program('test','VirtualMachinePoolTest.cc')