diff --git a/.gitignore b/.gitignore
index 9e270ad..189d7da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 composer.phar
 composer.lock
-vendor/
\ No newline at end of file
+vendor/
+build/
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 3519388..87cde44 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,21 @@
 language: php
 
+addons:
+  apt:
+    packages:
+    - cmake
+    - libgnutls-dev
+    - libuuid1
+    - uuid
+    - uuid-dev
+
 sudo: false
 
 cache:
   directories:
     - $HOME/.composer/cache
     - vendor
+    - build
 
 php:
   - 5.4
@@ -33,14 +43,15 @@ matrix:
       - php: 5.6
         env: TASKWARRIOR=2.5.0
 
-before_install:
-  - composer self-update
-
 install:
+  - bash build.sh $TASKWARRIOR
   - ln -s build/taskwarrior-$TASKWARRIOR task
   - chmod +x ./task
   - ./task --version
 
 before_script:
+    - composer self-update
     - composer update $PREFER_LOWEST
 
+script:
+  - vendor/bin/phpunit
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..ce55278
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+TASKWARRIOR=$1
+
+[ -d build ] || mkdir build
+
+if [ -f build/taskwarrior-$TASKWARRIOR ]
+  then
+    exit;
+fi
+
+cd build
+wget http://taskwarrior.org/download/task-$TASKWARRIOR.tar.gz || exit
+gunzip task-$TASKWARRIOR.tar.gz
+tar xf task-$TASKWARRIOR.tar
+cd task-$TASKWARRIOR
+cmake -DCMAKE_BUILD_TYPE=release .
+make
+cd ..
+cp task-$TASKWARRIOR/src/task ./taskwarrior-$TASKWARRIOR
+sudo rm -Rf task-$TASKWARRIOR*
+cd ..
\ No newline at end of file
diff --git a/build/build.sh b/build/build.sh
deleted file mode 100755
index 1826792..0000000
--- a/build/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-TASKWARRIOR=$1
-
-wget http://taskwarrior.org/download/task-$TASKWARRIOR.tar.gz
-gunzip task-$TASKWARRIOR.tar.gz
-tar xf task-$TASKWARRIOR.tar
-cd task-$TASKWARRIOR
-sudo apt-get install cmake build-essential uuid-dev libgnutls-dev libreadline6-dev --force-yes
-sudo cmake -DCMAKE_BUILD_TYPE=release .
-sudo make
-cd ..
-cp task-$TASKWARRIOR/src/task ./taskwarrior-$TASKWARRIOR
-sudo rm -Rf task-$TASKWARRIOR*
diff --git a/build/taskwarrior-2.4.3 b/build/taskwarrior-2.4.3
deleted file mode 100755
index d06cb93..0000000
Binary files a/build/taskwarrior-2.4.3 and /dev/null differ
diff --git a/build/taskwarrior-2.4.4 b/build/taskwarrior-2.4.4
deleted file mode 100755
index f513f44..0000000
Binary files a/build/taskwarrior-2.4.4 and /dev/null differ
diff --git a/build/taskwarrior-2.5.0 b/build/taskwarrior-2.5.0
deleted file mode 100755
index a3a51fa..0000000
Binary files a/build/taskwarrior-2.5.0 and /dev/null differ