diff --git a/.travis.yml b/.travis.yml
index bc739ffa..b738676a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,5 @@ compiler:
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev
-script: make gtest-bootstrap && make
+script: make gtest-bootstrap && make && make test
 
diff --git a/Makefile b/Makefile
index 5f080426..6012c780 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,8 @@ H264ENC_LDFLAGS = -L. -lencoder -lprocessing -lcommon
 
 CODEC_UNITTEST_LDFLAGS = -L. -lgtest -ldecoder -lcommon
 
+.PHONY: test
+
 all:	libraries binaries
 
 clean:
@@ -67,6 +69,9 @@ clean:
 gtest-bootstrap:
 	svn co https://googletest.googlecode.com/svn/trunk/ gtest
 
+test:
+	./codec_unittest
+
 include codec/common/targets.mk
 include codec/decoder/targets.mk
 include codec/encoder/targets.mk