diff --git a/test/cask/dsl_test.rb b/test/cask/dsl_test.rb
index 8081ca5dcd6..2bb6e0ec8a8 100644
--- a/test/cask/dsl_test.rb
+++ b/test/cask/dsl_test.rb
@@ -197,6 +197,12 @@ describe Cask::DSL do
       }.must_raise(CaskInvalidError)
     end
 
+    it "refuses to load invalid gpg key IDs" do
+      err = lambda {
+        invalid_cask = Cask.load('invalid/invalid-gpg-key-id')
+      }.must_raise(CaskInvalidError)
+    end
+
     it "refuses to load if gpg parameter is unknown" do
       err = lambda {
         invalid_cask = Cask.load('invalid/invalid-gpg-parameter')
diff --git a/test/support/Casks/invalid/invalid-gpg-key-id.rb b/test/support/Casks/invalid/invalid-gpg-key-id.rb
new file mode 100644
index 00000000000..40a36fa9e68
--- /dev/null
+++ b/test/support/Casks/invalid/invalid-gpg-key-id.rb
@@ -0,0 +1,11 @@
+class InvalidGpgKeyId < TestCask
+  version '1.2.3'
+  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+
+  url TestHelper.local_binary_url('caffeine.zip')
+  homepage 'http://example.com/invalid-gpg-key-id'
+  gpg 'http://example.com/gpg-signature.asc',
+      :key_id => '012'
+
+  app 'Caffeine.app'
+end