diff --git a/Formula/gnupg2.rb b/Formula/gnupg@2.0.rb
similarity index 81%
rename from Formula/gnupg2.rb
rename to Formula/gnupg@2.0.rb
index ef556ef8e49..a10323e8063 100644
--- a/Formula/gnupg2.rb
+++ b/Formula/gnupg@2.0.rb
@@ -1,19 +1,11 @@
-# This formula tracks GnuPG stable. You can find GnuPG Modern via:
-# brew install homebrew/versions/gnupg21
-# At the moment GnuPG Modern causes too many incompatibilities to be in core.
-class Gnupg2 < Formula
+class GnupgAT20 < Formula
   desc "GNU Privacy Guard: a free PGP replacement"
   homepage "https://www.gnupg.org/"
   url "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.0.30.tar.bz2"
   mirror "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.30.tar.bz2"
   sha256 "e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71"
-  revision 3
 
-  bottle do
-    sha256 "9289e192f19a2ed16b4910af8f7892fd8b93963805997d26192883803639b8ec" => :sierra
-    sha256 "ed3349ae0102f8fdc95d8feabe5bc34f74d2f66f1ccacec834a62ab8b931192a" => :el_capitan
-    sha256 "94c15342895e54b7692df595c2f2fc1d83f8e90f51d7831987542133e8a850c5" => :yosemite
-  end
+  keg_only :versioned_formula
 
   depends_on "libgpg-error"
   depends_on "libgcrypt"
@@ -79,7 +71,17 @@ class Gnupg2 < Formula
   end
 
   test do
-    Gpg.create_test_key(testpath)
+    (testpath/"batch.gpg").write <<-EOS.undent
+      Key-Type: RSA
+      Key-Length: 2048
+      Subkey-Type: RSA
+      Subkey-Length: 2048
+      Name-Real: Testing
+      Name-Email: testing@foo.bar
+      Expire-Date: 1d
+      %commit
+    EOS
+    system bin/"gpg", "--batch", "--gen-key", "batch.gpg"
     (testpath/"test.txt").write "Hello World!"
     system bin/"gpg", "--armor", "--sign", "test.txt"
     system bin/"gpg", "--verify", "test.txt.asc"