diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..95e37e0
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: erlang
+
+# install rebar 2.1.0-pre that supports 'raw' dependencies
+before_install:
+   - wget https://github.com/alavrik/piqi-erlang/wiki/rebar
+   - chmod +x rebar
+
+script: "./travis-ci"
+otp_release:
+   - R16B
+   - R15B03
+   - R15B02
+   - R15B01
+   - R15B
+   - R14B04
+   - R14B03
+   - R14B02
diff --git a/Makefile b/Makefile
index 0e8c2ca..5161b0b 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,10 @@ deps:
 	$(REBAR) get-deps
 
 
+test:
+	$(REBAR) eunit skip_deps=true
+
+
 dialyzer: all .dialyzer_deps_plt
 	dialyzer --plt .dialyzer_deps_plt ./ebin
 
diff --git a/README.md b/README.md
index 92b510f..315bb59 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Some useful commands:
 
     make test
     make dialyzer
-    make -C addressbook/example deps all test
+    make -C examples/addressbook deps all test
 
 
 License
diff --git a/examples/addressbook/rebar.config b/examples/addressbook/rebar.config
index 2ad5843..e2179d7 100644
--- a/examples/addressbook/rebar.config
+++ b/examples/addressbook/rebar.config
@@ -1,6 +1,6 @@
 
 {deps, [
-    %{piqi_rpc, "", {git, "git://github.com/alavrik/piqi-rpc.git", {branch, "dev"}}}
+    %{piqi_rpc, "", {git, "git://github.com/alavrik/piqi-rpc.git", {branch, "master"}}}
     {piqi_rpc, "", {git, "../../../.git", {branch, "HEAD"}}}
 ]}.
 
diff --git a/examples/process_info/rebar.config b/examples/process_info/rebar.config
index 2ad5843..e2179d7 100644
--- a/examples/process_info/rebar.config
+++ b/examples/process_info/rebar.config
@@ -1,6 +1,6 @@
 
 {deps, [
-    %{piqi_rpc, "", {git, "git://github.com/alavrik/piqi-rpc.git", {branch, "dev"}}}
+    %{piqi_rpc, "", {git, "git://github.com/alavrik/piqi-rpc.git", {branch, "master"}}}
     {piqi_rpc, "", {git, "../../../.git", {branch, "HEAD"}}}
 ]}.
 
diff --git a/travis-ci b/travis-ci
new file mode 100755
index 0000000..073265f
--- /dev/null
+++ b/travis-ci
@@ -0,0 +1,8 @@
+#!/bin/sh -xe
+
+export REBAR="`pwd`/rebar"
+
+make
+
+make test
+make -C examples/addressbook deps all test