diff --git a/.travis.yml b/.travis.yml
index b21098fe1..ebc9cb16d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ install:
 
 script:
   - make build
-  - make test
 
 after_success:
   - echo -e "Host ${DEPLOY_HOST}\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
diff --git a/Makefile b/Makefile
index edb894b9b..c234c24e6 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ build: dependencies
 # Test S2SS server by running it for 3 secs
 test: build
 	LD_LIBRARY_PATH=$(PREFIX)/usr/lib/ \
-	timeout --signal INT 3s \
+	timeout --signal INT --preserve-status 3s \
 	server/server server/etc/loopback.conf || true
 
 # Deploy
@@ -54,6 +54,6 @@ deploy: build
 	rsync --archive --delete documentation/html/ $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/doc/
 
 # Generate documentation
-doc: doxygen-1.8.10
+doc: $(PREFIX)/doxygen-1.8.10
 	PATH=$(PREFIX)/doxygen-1.8.10/bin/:$(PATH) \
 	doxygen
\ No newline at end of file