diff --git a/.gitignore b/.gitignore
index 66db326b..d4f5810f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,9 @@ XdgApp-1.0.*
 /test-doc-portal.trs
 /testdb.log
 /testdb.trs
+/tests/test-keyring/.gpg-v21-migrated
+/tests/test-keyring/private-keys-v1.d/
+/tests/test-keyring/trustdb.gpg
+/tests/hello*.xdgapp
+/tests/platform*.xdgapp
+/tests/repo
diff --git a/tests/hello.xdgapp b/tests/hello.xdgapp
deleted file mode 100644
index 843e8ad5..00000000
Binary files a/tests/hello.xdgapp and /dev/null differ
diff --git a/tests/make-test-bundles.sh b/tests/make-test-bundles.sh
new file mode 100755
index 00000000..3bdc5ce9
--- /dev/null
+++ b/tests/make-test-bundles.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+./make-test-runtime.sh
+./make-test-app.sh
+
+URL=file://`pwd`/repo
+
+REF=`(cd repo/refs/heads; echo app/org.test.Hello/*/master)`
+
+xdg-app build-bundle repo hello.xdgapp org.test.Hello
+xdg-app build-bundle repo hello-key.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} hello-origin.xdgapp org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin.xdgapp org.test.Hello
+
+ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
+
+xdg-app build-bundle repo hello-signed.xdgapp org.test.Hello
+xdg-app build-bundle repo hello-key-signed.xdgapp --gpg-keys=test-keyring/pubring.gpg org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} hello-origin-signed.xdgapp org.test.Hello
+xdg-app build-bundle repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg hello-key-origin-signed.xdgapp org.test.Hello
+
+REF=`(cd repo/refs/heads; echo runtime/org.test.Platform/*/master)`
+ostree gpg-sign --repo=repo --gpg-homedir=test-keyring ${REF} 7B0961FD
+xdg-app build-bundle --runtime repo --repo-url=${URL} --gpg-keys=test-keyring/pubring.gpg platform.xdgapp org.test.Platform
diff --git a/tests/test-keyring/README b/tests/test-keyring/README
new file mode 100644
index 00000000..7586ed3e
--- /dev/null
+++ b/tests/test-keyring/README
@@ -0,0 +1,3 @@
+These are completely random keys, which include the secret key.
+Use these for testing gpg signing, do *NOT* ever use these for any
+real application.
diff --git a/tests/test-keyring/pubring.gpg b/tests/test-keyring/pubring.gpg
new file mode 100644
index 00000000..78791913
Binary files /dev/null and b/tests/test-keyring/pubring.gpg differ
diff --git a/tests/test-keyring/secring.gpg b/tests/test-keyring/secring.gpg
new file mode 100644
index 00000000..03bc3fa6
Binary files /dev/null and b/tests/test-keyring/secring.gpg differ