diff --git a/.travis.yml b/.travis.yml
index 04133af..14d3b49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,4 +20,5 @@ before_script:
   - sudo make --directory=extras/kdf-keys install
 
 script:
+  - make --directory=extras/kdf-keys test
   - make test
diff --git a/extras/kdf-keys/Makefile b/extras/kdf-keys/Makefile
index 34c060a..ad04fba 100644
--- a/extras/kdf-keys/Makefile
+++ b/extras/kdf-keys/Makefile
@@ -7,6 +7,10 @@ all:
 	$(CC) -O2 -o tomb-kdb-pbkdf2-gensalt gen_salt.c -lgcrypt
 	$(CC) -O2 -o tomb-kdb-hexencode hexencode.c
 
+test:
+	@echo "Running Tomb-kdb tests"
+	./test.sh
+
 clean:
 	rm -f tomb-kdb-pbkdf2 tomb-kdb-pbkdf2-getiter tomb-kdb-pbkdf2-gensalt tomb-kdb-hexencode