diff --git a/.travis.yml b/.travis.yml
index 2e1898d9b..727727e57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,17 @@ go:
   - 1.6
   - tip
 
+env:
+  - FIX_TEST=
+  - FIX_TEST=fix40
+  - FIX_TEST=fix41
+  - FIX_TEST=fix42
+  - FIX_TEST=fix43
+  - FIX_TEST=fix44
+  - FIX_TEST=fix50
+  - FIX_TEST=fix50sp1
+  - FIX_TEST=fix50sp2
+
 matrix:
   allow_failures:
     - go: tip
@@ -12,5 +23,4 @@ matrix:
 install: 
   - make get
 
-before_script: make generate
-script: make travis_test
+script: if [ -z "$FIX_TEST" ]; then make generate && make build && make; else make build_accept && make $FIX_TEST; fi
diff --git a/Makefile b/Makefile
index fb88e2655..dc2bea953 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,4 @@ fix50sp2:
 ACCEPT_SUITE=fix40 fix41 fix42 fix43 fix44 fix50 fix50sp1 fix50sp2 
 accept: $(ACCEPT_SUITE)
 
-
-travis_test: all build accept
-
 .PHONY: test $(ACCEPT_SUITE)