diff --git a/Makefile b/Makefile
index 9d2bb25a..bc3ccb02 100644
--- a/Makefile
+++ b/Makefile
@@ -38,11 +38,7 @@ uninstall:
 	done
 
 check:
-	@for f in bin/*; do \
-		export PATH=$$f:$$PATH; \
-	done
-	@export LD_PRELOAD=$$PWD/lib/libxbps.so
-	@kyua test -k tests/xbps/Kyuafile
+	@./run-tests
 
 clean:
 	@for dir in $(SUBDIRS); do		\
diff --git a/run-tests b/run-tests
new file mode 100755
index 00000000..85a51ccd
--- /dev/null
+++ b/run-tests
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+for f in bin/*; do
+	export PATH=$PWD/$f:$PATH
+done
+export LD_PRELOAD=$PWD/lib/libxbps.so
+kyua test -k tests/xbps/Kyuafile