diff --git a/.travis.yml b/.travis.yml
index c057d3ee..a107b03b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
     - check
     - libevent-dev
     - libev-dev
+    - valgrind
 script:
   - mkdir tests
   - cd tests
diff --git a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.ds b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.ds
new file mode 100644
index 00000000..8750f478
--- /dev/null
+++ b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.ds
@@ -0,0 +1 @@
+.	DS	19036 8 2 49aac11d7b6f6446702e54a1607371607a1a41855200fd2ce1cdde32f24e8fb5
diff --git a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc
new file mode 100644
index 00000000..c2204dee
--- /dev/null
+++ b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc
@@ -0,0 +1,16 @@
+BaseName: 125-valgrind-checks
+Version: 1.0
+Description: Run valgrind to detect memory leaks
+CreationDate: ma mrt 21 15:59:59 CET 2016
+Maintainer: Willem Toorop
+Category: 
+Component:
+CmdDepends: 
+Depends: 110-link.tpkg
+Help:
+Pre: 
+Post: 
+Test: 125-valgrind-checks.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test
new file mode 100644
index 00000000..07d6d9c9
--- /dev/null
+++ b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test
@@ -0,0 +1,15 @@
+# #-- 125-valgrind-checks.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+cat >queries <<EOT
+NS .
+-A getdnsapi.net
+qwerlkjhasdfpuiqwyerm.1234kjhrqwersv.com
+-G TXT bogus.nlnetlabs.nl
+-H 8.8.8.8
+-H 2a04:b900:0:100::37
+EOT
+"${BUILDDIR}/build/libtool" exec valgrind -v --leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1 --errors-for-leak-kinds=definite,possible --track-origins=yes "${GETDNS_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain
diff --git a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.ds b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.ds
new file mode 100644
index 00000000..8750f478
--- /dev/null
+++ b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.ds
@@ -0,0 +1 @@
+.	DS	19036 8 2 49aac11d7b6f6446702e54a1607371607a1a41855200fd2ce1cdde32f24e8fb5
diff --git a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc
new file mode 100644
index 00000000..2ff59bdf
--- /dev/null
+++ b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc
@@ -0,0 +1,16 @@
+BaseName: 225-stub-only-valgrind-checks
+Version: 1.0
+Description: Run valgrind to detect memory leaks
+CreationDate: ma mrt 21 16:24:56 CET 2016
+Maintainer: Willem Toorop
+Category: 
+Component:
+CmdDepends: 
+Depends: 110-link.tpkg
+Help:
+Pre: 
+Post: 
+Test: 225-stub-only-valgrind-checks.test
+AuxFiles: 
+Passed:
+Failure:
diff --git a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test
new file mode 100644
index 00000000..4b865abd
--- /dev/null
+++ b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test
@@ -0,0 +1,15 @@
+# #-- 225-stub-only-valgrind-checks.test --#
+# source the master var file when it's there
+[ -f ../.tpkg.var.master ] && source ../.tpkg.var.master
+# use .tpkg.var.test for in test variable passing
+[ -f .tpkg.var.test ] && source .tpkg.var.test
+
+cat >queries <<EOT
+NS .
+-A getdnsapi.net
+qwerlkjhasdfpuiqwyerm.1234kjhrqwersv.com
+-G TXT bogus.nlnetlabs.nl
+-H 8.8.8.8
+-H 2a04:b900:0:100::37
+EOT
+"${BUILDDIR}/build-stub-only/libtool" exec valgrind -v --leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1 --errors-for-leak-kinds=definite,possible --track-origins=yes "${GETDNS_STUB_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain