diff --git a/.travis.yml b/.travis.yml
index f9f2fe524..1f6159e55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,5 +13,5 @@ before_install:
     - sudo apt-get -qq install bats btrfs-tools git libapparmor-dev libdevmapper-dev libglib2.0-dev libgpgme11-dev libselinux1-dev
     - sudo apt-get -qq remove libseccomp2
 script:
-    - make install.tools install.libseccomp.sudo all runc validate TAGS="containers_image_ostree_stub apparmor seccomp"
+    - make install.tools install.libseccomp.sudo all runc validate TAGS="apparmor seccomp"
     - cd tests; sudo PATH="$PATH" ./test_runner.sh
diff --git a/Makefile b/Makefile
index 1c403471d..1992fb238 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-AUTOTAGS := $(shell ./btrfs_tag.sh) $(shell ./libdm_tag.sh)
+AUTOTAGS := $(shell ./btrfs_tag.sh) $(shell ./libdm_tag.sh) $(shell ./ostree_tag.sh) $(shell ./selinux_tag.sh)
 TAGS := seccomp
 PREFIX := /usr/local
 BINDIR := $(PREFIX)/bin
diff --git a/ostree_tag.sh b/ostree_tag.sh
new file mode 100755
index 000000000..89499c5e8
--- /dev/null
+++ b/ostree_tag.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+if ! pkg-config ostree-1 2> /dev/null ; then
+	echo containers_image_ostree_stub
+fi
diff --git a/selinux_tag.sh b/selinux_tag.sh
new file mode 100755
index 000000000..ff80fda04
--- /dev/null
+++ b/selinux_tag.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+if pkg-config libselinux 2> /dev/null ; then
+	echo selinux
+fi