diff --git a/.travis.yml b/.travis.yml
index 7653bc4150..2ad4485d01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,10 @@
     email: false
   go:
     - 1.7
-  script: make tools .gitvalidation validate test test-skopeo
+  env:
+    - BUILDTAGS='btrfs_noversion libdm_no_deferred_remove'
+    - BUILDTAGS='btrfs_noversion libdm_no_deferred_remove containers_image_openpgp'
+  script: make tools .gitvalidation validate test test-skopeo BUILDTAGS="$BUILDTAGS"
   dist: trusty
   os:
     - linux