diff --git a/tests/wscript b/tests/wscript
index 0407962..fa36e78 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -5,12 +5,33 @@
 top = '..'
 
 def build(bld):
-    if bld.env['WITH_TESTS']:
-        unit_tests = bld.program(
-            target='../unit-tests',
-            features='cxx cxxprogram',
-            source=bld.path.ant_glob(['**/*.cpp']),
-            use='ndns-objects',
-            install_path=None,
-            defines="BUILDDIR=\"%s\"" % Context.out_dir,
-          )
+    if not bld.env['WITH_TESTS']:
+        return
+    dst = bld.bldnode.make_node("conf-test/anchors")
+    dst.mkdir()
+
+    bld(features = "subst",
+        name = 'test-validator-conf',
+        source = '../validator.conf.sample.in',
+        target = '../conf-test/validator.conf',
+        use = 'validator-sample',
+        ANCHORPATH='\"anchors/root.cert\"',
+        RELATION='is-prefix-of',
+    )
+
+    bld(features = "subst",
+        name = 'test-logger-conf',
+        source = '../log4cxx.properties.sample.in',
+        target = '../conf-test/log4cxx.properties.sample',
+        is_copy = True,
+        use = 'log4cxx-sample',
+    )
+
+    unit_tests = bld.program(
+        target='../unit-tests',
+        features='cxx cxxprogram',
+        source=bld.path.ant_glob(['**/*.cpp']),
+        use='ndns-objects',
+        install_path=None,
+        defines='TEST_CONFIG_PATH=\"%s/conf-test\"' %(bld.bldnode)
+    )