diff --git a/extras/test/20_recipients.sh b/extras/test/20_recipients.sh
index 3751ac7..8355765 100644
--- a/extras/test/20_recipients.sh
+++ b/extras/test/20_recipients.sh
@@ -32,6 +32,13 @@ test_expect_success 'Testing tomb with GnuPG keys using hidden recipient' '
     tt_lock -g -R $KEY1
     '
 
+test_export "subkeys"
+test_expect_success 'Testing tomb with GnuPG subkeys' '
+    tt_dig -s 20 &&
+    tt_forge -g -R $SUBKEY2 &&
+    tt_lock -g -R $SUBKEY2
+    '
+
 test_export "shared"
 test_expect_success 'Testing tomb with GnuPG keys and shared tomb' '
     tt_dig -s 20 &&
diff --git a/extras/test/setup b/extras/test/setup
index a738934..34ff2b0 100644
--- a/extras/test/setup
+++ b/extras/test/setup
@@ -60,6 +60,9 @@ unset GPG_AGENT_INFO
 export GNUPGHOME="$TEST_HOME/gnupg/"
 export KEY1="A4857CD176B31435F9709D25F0E573B8289439CD"
 export KEY2="0B2235E660753AB0475FB3E23DC836481F44B31E"
+export SUBKEY1="D89BE71A935779961C130E50D9D7ACED39D3991C!"
+export SUBKEY2="843077BF7FD4A9C7BBFC3A69F065568B4F7D6CA9!"
+
 chmod 700 "$GNUPGHOME"