diff --git a/.travis.yml b/.travis.yml
index c5c539f3..090b0c67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,18 @@
-sudo: required
 
-services:
-  - docker
+matrix:
+  include:
+  -  os: linux
+     sudo: required
+     services:
+       - docker
+  -  os: osx
 
 notifications:
   email: false
 
+install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gpgme ; fi
+
 script:
-  - make check
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then hack/travis_osx.sh ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make check ; fi
diff --git a/Makefile b/Makefile
index 0e3f0465..89a106ec 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,8 @@ MANPAGES_MD = $(wildcard docs/*.md)
 
 BTRFS_BUILD_TAG = $(shell hack/btrfs_tag.sh)
 LIBDM_BUILD_TAG = $(shell hack/libdm_tag.sh)
-LOCAL_BUILD_TAGS = $(BTRFS_BUILD_TAG) $(LIBDM_BUILD_TAG)
+DARWIN_BUILD_TAG = $(shell hack/darwin_tag.sh)
+LOCAL_BUILD_TAGS = $(BTRFS_BUILD_TAG) $(LIBDM_BUILD_TAG) $(DARWIN_BUILD_TAG)
 BUILDTAGS += $(LOCAL_BUILD_TAGS)
 
 #   make all DEBUG=1
diff --git a/hack/darwin_tag.sh b/hack/darwin_tag.sh
new file mode 100755
index 00000000..eaa09184
--- /dev/null
+++ b/hack/darwin_tag.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ $(uname) == "Darwin" ]; then
+  echo "containers_image_ostree_stub"
+fi
diff --git a/hack/travis_osx.sh b/hack/travis_osx.sh
new file mode 100755
index 00000000..e4662f6a
--- /dev/null
+++ b/hack/travis_osx.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -e
+
+export GOPATH=$(pwd)/_gopath
+_projectatomic="${GOPATH}/src/github.com/projectatomic"
+mkdir -vp ${_projectatomic}
+ln -vsf $(pwd) ${_projectatomic}/skopeo
+
+cd ${_projectatomic}/skopeo
+make validate-local test-unit-local binary-local