diff --git a/tests/wscript b/tests/wscript
index d6bcf93..5d667b5 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -5,8 +5,10 @@
 from waflib import Logs
 
 def build(bld):
-    Logs.error("Unit tests are temporary disabled")
-    return
+    if not bld.env['WITH_TESTS']:
+        return
+
+    Logs.error("Most unit tests are temporary disabled")
 
     bld(features='cxx',
         target='unit-tests-main',
@@ -19,8 +21,9 @@
     unit_tests = bld.program(
             target='../unit-tests',
             features='cxx cxxprogram',
-            source=bld.path.ant_glob(['**/*.cpp'], excl=['main.cpp']),
-            use='unit-tests-main chronoshare',
+            source=bld.path.ant_glob(['**/*.cpp'], excl=['main.cpp',
+                                                         'unit-tests/**/*.cpp']),
+            use='unit-tests-main core-objects chronoshare',
             install_path=None,
             defines='UNIT_TEST_CONFIG_PATH=\"%s/tmp-files/\"' % (bld.bldnode),
             includes='.. ../src .',