diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..208f986ca
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+language: go
+go:
+    - 1.6.x
+    - 1.7.x
+    - 1.8.x
+    - tip
+
+sudo: required
+
+install:
+    - make install.tools
+
+before_script:
+    - export PATH=$HOME/gopath/bin:$PATH
+
+script:
+    - make .gitvalidation
+    - make verify
+    - make binaries
diff --git a/Makefile b/Makefile
index 60bff994a..04cbb4c8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= f2925f58acc259c4b894353f5fc404bdeb40028e
+EPOCH_TEST_COMMIT ?= 022b25259e31784d68192cdcd87a82d6c357a1bb
 PROJECT := github.com/kubernetes-incubator/cri-containerd
 BINDIR ?= ${DESTDIR}/usr/local/bin
 BUILD_DIR ?= _output