diff --git a/.travis.yml b/.travis.yml
index 83f2ba6..62746ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,4 +22,4 @@ install:
   - ./.travis-ci-build libnfc
 script:
   - ./.travis-ci-build .
-  - if [ "$BLD" = autotools ]; then (cd build-autotools && cutter test); fi
+  - if [ "$BLD" = autotools ]; then (cd build-autotools && make check TESTS_ENVIRONMENT=SKIP_TESTS=1 && cutter test); fi
diff --git a/test/run-test.sh b/test/run-test.sh
index 2c8bc7b..2feb389 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ -n "${SKIP_TESTS}" ]; then
+	exit 0
+fi
+
 export BASE_DIR="`dirname $0`"
 
 if test -z "$NO_MAKE"; then