diff --git a/.travis.yml b/.travis.yml
index 40992ce979..42eda2bb63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,8 @@ dist: trusty
 language: bash
 services: docker
 env:
-  global:
-    - USE_CONTAINER=true
   matrix:
-    - TARGET_OS=linux TARGET_ARCH=amd64
-    - TARGET_OS=darwin TARGET_ARCH=amd64
-    - TARGET_OS=windows TARGET_ARCH=amd64
-    # - TARGET_OS=linux TARGET_ARCH=386
-    # - TARGET_OS=darwin TARGET_ARCH=386
-    # - TARGET_OS=windows TARGET_ARCH=386
-script: make dco fmt lint vet test-long coverage-send
+    - TARGET_OS=linux TARGET_ARCH=amd64 TARGETS="make dco fmt lint vet test-long coverage-send"
+    - TARGET_OS=darwin TARGET_ARCH=amd64 TARGETS="cross"
+    - TARGET_OS=windows TARGET_ARCH=amd64 TARGETS="cross"
+script: USE_CONTAINER=true make "$TARGETS"