diff --git a/db/migrate/20141120110330_create_zonefile_setting.rb b/db/migrate/20141120110330_create_zonefile_setting.rb
index fdba51948..67f437a0a 100644
--- a/db/migrate/20141120110330_create_zonefile_setting.rb
+++ b/db/migrate/20141120110330_create_zonefile_setting.rb
@@ -1,4 +1,5 @@
 class CreateZonefileSetting < ActiveRecord::Migration
+  # rubocop:disable Metrics/MethodLength
   def change
     create_table :zonefile_settings do |t|
       t.string :origin
diff --git a/spec/models/dnskey_spec.rb b/spec/models/dnskey_spec.rb
index 116b5ebbf..fe57fa8dc 100644
--- a/spec/models/dnskey_spec.rb
+++ b/spec/models/dnskey_spec.rb
@@ -7,11 +7,38 @@ describe Dnskey do
 
   it { should belong_to(:domain) }
 
-  it 'generates digest' do
+  it 'generates correct DS digest' do
     d = Fabricate(:domain, name: 'ria.ee')
-    ds = d.dnskeys.first
+    dk = d.dnskeys.first
 
-    ds.generate_digest
-    expect(ds.ds_digest).to eq('0B62D1BC64EFD1EE652FB102BDF1011BF514CCD9A1A0CFB7472AEA3B01F38C92')
+    dk.generate_digest
+    expect(dk.ds_digest).to eq('0B62D1BC64EFD1EE652FB102BDF1011BF514CCD9A1A0CFB7472AEA3B01F38C92')
+  end
+
+  # rubocop: disable Style/NumericLiterals
+  it 'generates correct DS key tag' do
+    d = Fabricate(:domain, name: 'ria.ee')
+    dk = d.dnskeys.first
+    expect(dk.ds_key_tag).to eq(30607)
+
+    d.name = 'emta.ee'
+
+    dk = d.dnskeys.first
+    dk.public_key = 'AwEAAfB9jK8rj/FAdE3t9bYXiTLpelwlgUyxbHEtvMvhdxs+yHv0h9fE '\
+                    '710u94LPAeVmXumT6SZPsoo+ALKdmTexkcU9DGQvb2+sPfModBKM/num '\
+                    'rScUw1FBe3HwRa9SqQpgpnCjIt0kEVKHAQdLOP86YznSA9uHAg9TTJuT '\
+                    'LkUtgtmwNAVFr6/mG+smE1v5NbxPccsFwVTA/T1IyaI4Z48VGCP2WNro '\
+                    'R7P6vet1gWhssirnnVYnur8DwWuMJ89o/HjzXeiEGUB8k5SOX+//67FN '\
+                    'm8Zs+1ObuAfY8xAHe0L5bxluEbh1T1ARp41QX77EMKVbkcSj7nuBeY8H '\
+                    'KiN8HsTvmZyDbRAQQaAJi68qOXsUIoQcpn89PoNoc60F7WlueA6ExSGX '\
+                    'KMWIH6nfLXFgidoZ6HxteyUUnZbHEdULjpAoCRuUDjjUnUgFS7eRANfw '\
+                    'RCcu9aLziMDp4UU61zVjtmQ7xn3G2W2+2ycqn/vEl/yFyBmHZ+7stpoC '\
+                    'd6NTZUn4/ellYSm9lx/vaXdPSinARpYMWtU79Hu/VRifaCQjYkBGAMwK '\
+                    'DshX4yJPjza/bqo0XV4WHj1szDFHe0tLN7g1Ojwtf5FR0zyHU3FN9uUa '\
+                    'y8a+dowd/fqOQA1jXR04g2PIfFYe0VudCEpmxSV9YDoqjghHeIKUX7Jn '\
+                    'KiHL5gk404S5a/Bv'
+
+    d.save
+    expect(dk.ds_key_tag).to eq(31051)
   end
 end