diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
new file mode 100755
index 00000000..31a9239a
--- /dev/null
+++ b/tests/make-test-app.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+DIR=`mktemp -d`
+
+# Init dir
+xdg-app build-init ${DIR} org.test.Hello org.test.Platform org.test.Platform
+
+mkdir -p ${DIR}/files/bin
+cat > ${DIR}/files/bin/hello.sh <<EOF
+#!/bin/sh
+echo "Hello world, from a sandbox"
+EOF
+chmod a+x ${DIR}/files/bin/hello.sh
+
+xdg-app build-finish --command=hello.sh ${DIR}
+xdg-app build-export repo ${DIR}
+rm -rf ${DIR}
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
new file mode 100755
index 00000000..b9c23b2d
--- /dev/null
+++ b/tests/make-test-runtime.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+set -e
+
+DIR=`mktemp -d`
+
+xdg-app build-init ${DIR} org.test.Platform org.test.Platform org.test.Platform
+sed -i s/Application/Runtime/ ${DIR}/metadata
+
+# Add bash and dependencies
+mkdir -p ${DIR}/usr/bin
+mkdir -p ${DIR}/usr/lib
+ln -s ../lib ${DIR}/usr/lib64
+BASH=`which bash`
+cp ${BASH} ${DIR}/usr/bin
+ln -s bash ${DIR}/usr/bin/sh
+for i in `ldd ${BASH}  | sed "s/.* => //" | awk '{ print $1}' | grep ^/`; do
+    cp "$i" ${DIR}/usr/lib/
+done
+
+xdg-app build-export --runtime repo ${DIR}
+rm -rf ${DIR}