diff --git a/.travis.yml b/.travis.yml
index cf18889..d3ce18a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,5 @@
-language: d
 sudo: false
+language: d
+script:
+    - git submodule update --init --recursive
+    - make test
diff --git a/makefile b/makefile
index 0de7db3..c5cecc1 100644
--- a/makefile
+++ b/makefile
@@ -46,7 +46,9 @@ ldcbuild: githash
 	${LDC} -O5 -release -oq -of=bin/dscanner ${VERSIONS} ${INCLUDE_PATHS} ${SRC} -J.
 
 test:
-	@./test.sh
+	${DC} -w -g -J. -unittest ${INCLUDE_PATHS} ${SRC} -ofbin/dscanner-unittest -version=StdLoggerDisableWarning
+	./bin/dscanner-unittest
+	rm -f bin/dscanner-unittest
 
 clean:
 	rm -rf dsc