diff --git a/hack/test-docker.sh b/hack/test-docker.sh
index 089fd66d6..29fb6684b 100755
--- a/hack/test-docker.sh
+++ b/hack/test-docker.sh
@@ -24,4 +24,4 @@ echo
 echo "Running docker integration tests ..."
 echo
 
-S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/docker -v -tags "integration" "${@:1}"
+S2I_BUILD_TAGS="integration" S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/docker -v "${@:1}"
diff --git a/hack/test-dockerfile.sh b/hack/test-dockerfile.sh
index 1dd5a18f5..4ff51090b 100755
--- a/hack/test-dockerfile.sh
+++ b/hack/test-dockerfile.sh
@@ -17,4 +17,4 @@ echo
 echo "Running dockerfile integration tests ..."
 echo
 
-S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/dockerfile -v -tags "integration" "${@:1}"
+S2I_BUILD_TAGS="integration" S2I_TIMEOUT="-timeout 600s" "${S2I_ROOT}/hack/test-go.sh" test/integration/dockerfile -v "${@:1}"
diff --git a/hack/test-go.sh b/hack/test-go.sh
index 32df51ae5..b6621bc54 100755
--- a/hack/test-go.sh
+++ b/hack/test-go.sh
@@ -28,6 +28,7 @@ find_test_dirs() {
 S2I_RACE=${S2I_RACE--race}
 S2I_COVER=${S2I_COVER--cover}
 S2I_TIMEOUT=${S2I_TIMEOUT--timeout 60s}
+S2I_BUILD_TAGS=""
 
 if [ "${1-}" != "" ]; then
   test_packages="$S2I_GO_PACKAGE/$1"
@@ -49,7 +50,7 @@ if [[ -n "${OUTPUT_COVERAGE}" ]]; then
     fi
     S2I_COVER_PROFILE="-coverprofile=${PROFILEPATH}"
 
-    go test $S2I_RACE $S2I_TIMEOUT $S2I_COVER "$S2I_COVER_PROFILE" "$test_package" "${@:2}"
+    go test -tags "$S2I_BUILD_TAGS exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" $S2I_RACE $S2I_TIMEOUT $S2I_COVER "$S2I_COVER_PROFILE" "$test_package" "${@:2}"
   done
 
   echo 'mode: atomic' > ${OUTPUT_COVERAGE}/profiles.out
@@ -66,5 +67,5 @@ if [[ -n "${OUTPUT_COVERAGE}" ]]; then
   # remove ${OUTPUT_COVERAGE}/github.com
   rm -rf $OUTPUT_COVERAGE/${S2I_GO_PACKAGE%%/*}
 else
-  go test $S2I_RACE $S2I_TIMEOUT $S2I_COVER "${@:2}" $test_packages
+  go test -tags "$S2I_BUILD_TAGS exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" $S2I_RACE $S2I_TIMEOUT $S2I_COVER "${@:2}" $test_packages
 fi
diff --git a/hack/verify-govet.sh b/hack/verify-govet.sh
index 1bf97d7a7..0602b017e 100755
--- a/hack/verify-govet.sh
+++ b/hack/verify-govet.sh
@@ -15,7 +15,7 @@ FAILURE=false
 test_dirs=$(s2i::util::find_files | cut -d '/' -f 1-2 | sort -u)
 for test_dir in $test_dirs
 do
-  if ! go vet $test_dir
+  if ! go vet -tags "exclude_graphdriver_devicemapper exclude_graphdriver_btrfs" $test_dir
   then
     FAILURE=true
   fi