diff --git a/.travis.yml b/.travis.yml
index 2432a053e5..6aac8c99fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,11 @@
     email: false
   go:
     - 1.7
+  env:
+    - BUILDTAGS='btrfs_noversion libdm_no_deferred_remove'
+    - BUILDTAGS='btrfs_noversion libdm_no_deferred_remove containers_image_openpgp'
   install: make deps
-  script: make .gitvalidation && make validate && make test && make test-skopeo
+  script: make .gitvalidation && make validate && make test BUILDTAGS="$BUILDTAGS" && make test-skopeo BUILDTAGS="$BUILDTAGS"
   dist: trusty
   os:
     - linux