diff --git a/.travis.yml b/.travis.yml
index 4e323fa..69bceaa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@
 env:
   global:
     - LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/tests/:$TRAVIS_BUILD_DIR:$LD_LIBRARY_PATH
-    - DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/tests/:$TRAVIS_BUILD_DIR:$DYLD_LIBRARY_PATH
 script:
   - ./make.sh
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ./make.sh install; fi
   - make check
   - cd bindings/python && make check
 compiler:
diff --git a/Makefile b/Makefile
index 933e46e..837148c 100644
--- a/Makefile
+++ b/Makefile
@@ -443,11 +443,9 @@
 TESTS += test_mips.static test_ppc.static test_sparc.static
 TESTS += test_systemz.static test_x86.static test_xcore.static
 TESTS += test_skipdata test_skipdata.static test_iter.static
-check:
-	@for t in $(TESTS); do \
-		echo Check $$t ... ; \
-		LD_LIBRARY_PATH=./tests ./tests/$$t > /dev/null && echo OK || echo FAILED; \
-	done
+check: $(TESTS)
+test_%:
+	./tests/$@ > /dev/null && echo OK || echo FAILED
 
 $(OBJDIR)/%.o: %.c
 	@mkdir -p $(@D)