diff --git a/.travis.yml b/.travis.yml
index 6444642..f60bbe0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,8 @@ php:
   - 5.6
   - hhvm
 
-script: build.sh
+before_script:
+  - travis_retry composer self-update
+  - travis_retry composer install --prefer-source --no-interaction --dev
+
+script: phpunit
diff --git a/composer.json b/composer.json
index eb86454..6d3b37e 100644
--- a/composer.json
+++ b/composer.json
@@ -14,11 +14,19 @@
     "require": {
         "php": ">=5.4"
     },
+    "require-dev": {
+        "phpunit/phpunit": "~4.0"
+    },
     "autoload": {
         "psr-4": {
             "Bissolli\\ValidadorCpfCnpj\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Bissolli\\ValidadorCpfCnpj\\Tests\\": "tests/"
+        }
+    },
     "branch-alias": {
         "dev-master": "1.0"
     }