diff --git a/.jenkins.d/20-build.sh b/.jenkins.d/20-build.sh
index a45f442..e3bb195 100755
--- a/.jenkins.d/20-build.sh
+++ b/.jenkins.d/20-build.sh
@@ -5,13 +5,13 @@
 # Cleanup
 sudo ./waf -j1 --color=yes distclean
 
-# Configure/build in release mode
+# Configure/build in release mode without tests
 ./waf -j1 --color=yes configure
 ./waf -j1 --color=yes build
 
 # Cleanup
 sudo ./waf -j1 --color=yes distclean
 
-# Configure/build in debug mode
-./waf -j1 --color=yes configure --debug
+# Configure/build in debug mode with tests
+./waf -j1 --color=yes configure --with-tests --debug
 ./waf -j1 --color=yes build
diff --git a/.jenkins.d/30-tests.sh b/.jenkins.d/30-tests.sh
new file mode 100755
index 0000000..d045565
--- /dev/null
+++ b/.jenkins.d/30-tests.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -x
+set -e
+
+rm -rf $HOME/.ndn
+./build/unit-tests -l test_suite