diff --git a/tests/pillar/repo_galeracluster.sls b/tests/pillar/repo_galeracluster.sls
index 9e9c1bf..66214cd 100644
--- a/tests/pillar/repo_galeracluster.sls
+++ b/tests/pillar/repo_galeracluster.sls
@@ -3,20 +3,90 @@
     enabled: true
     repo:
       galeracluster:
-        key_id: BC19DDBA
-        key_server: hkp://p80.pool.sks-keyservers.net:80
         pin:
         - pin: 'release o=Galera Cluster'
           priority: 1001
           package: '*'
+        gpgkey: |
+          -----BEGIN PGP PUBLIC KEY BLOCK-----
+          Comment: key_id: BC19DDBA
+
+          mQENBFSC9PABCADViCrLIvhcuppbuFaCRiZYLvCoZ8st9uMwrofvbVbokWFZgwq/
+          tGzCi4o2O042hZS1q9FrB5au8u/Hj/NtGHLXpuSo6IvsAE+dkhSOKvBHxjvVLhbR
+          WYA4EmHAMiCVTYI71MGSrsWcAm0aBwtieXiMavo46cjscQGuXh2qiHuH8UQk3sW0
+          1yHngS27zg5tXHa1OXL1AwN9fnINoyHfMv0Qtt7xVjTW8YCJqESuK8rVAhI53hBM
+          FEhVRkay2y07olHXD40Q1/+pZ/Bzo5t6VZVOidiml/Euu2QWEvVKVKEe8zhEXkJr
+          ZdwTe4gIlsF78gD6uycllurMl0QFM+uhcUyhABEBAAG0JUNvZGVyc2hpcCBPeSA8
+          aW5mb0BnYWxlcmFjbHVzdGVyLmNvbT6JATgEEwECACIFAlSC9PACGwMGCwkIBwMC
+          BhUIAgkKCwQWAgMBAh4BAheAAAoJENZpAX68Gd26ovwIAMEm1mBMvMjrB9N6vbZx
+          nuxWmbW2IqINbL5oSsk7+wn0tZteywk+BWNuiU7mVVChuIRl/PtbETUyJkf7SDNx
+          qk7JGtMjL5fZZ/mcwC/vCLVjJHIgkuFodqnnJ40kp2+pwrn5+Xp5H6Z6dLwTBFv4
+          IW34SgKlH63+xYVPImBsse8a9b7UwevWpoY+NNGDTaGdvGk6hJd2teuU5f7DbVe9
+          9WFbdoLt4f0ZZhEW1IWbyW4s6JWrOhnd7EpzrSzwAA+MyETbGkyXBmaAybYGtE3/
+          XdZzyvQcgBkYHOVHy/AJnW6bRrTfiUVGqF5TCFbTAcw0flwV4PkyJVszbhySRhUh
+          oHS5AQ0EVIL08AEIANKaVOsr6NVO1Dnn367JiXf+52dAMcuIvd8y9UY7RP3ONdRB
+          XbwmnknQDrVTAblWxH3lZdsjQwJkmM7l0ryKWhJMYsarbjIHTkKXdT5juskm0PXg
+          gPj+xJm9ejNBWj7IpPicILBJmvIs3DtQ9LGYkyxCmABBycw0OkXiJAODj3AB2f7+
+          D7PEMwwGH1KZDPD5PX54IXThHwzsakRa2qApyk8/K8NN6uBOhVXSx4MAbzTwf5U6
+          zRlN/HO6Rd2vRBA15VkaJWwPlQAGSVLyApkUB/CXh7bwB0Bdp2ttZnaYVI4IHqyB
+          Vi5b0VY1bBYZplGhnB91avSX/jiL1fQVnnbOAOMAEQEAAYkBHwQYAQIACQUCVIL0
+          8AIbDAAKCRDWaQF+vBnduqSlCADPD52hKg1DNmBRJ3dHM5qx3K5evbGTsyi5G2ol
+          G0C03VJbovZ6UTI+34dsw5YaRfxHmjsO7sH+PAk/4F+xOHz+Q7I7MRITTgV+tlcl
+          LSE6riAFllfIvCm2zPwViUwLJfurqINOke010szCw+gynJgp40M1YFGwu2wSeWaN
+          7SO8eIe7BqaJ0tgh8INLbh2QhLpvszZTWrKEOE7ReLwzo9uB7Le09D3uTussGrNk
+          3/lvP1T0Y+McC3Js00nprdUgk17tDDmt+ikl2IWO02litImXQexEeRoA1YiagJX0
+          CCJXr6iFgKG+7gpDxa0H49GuJPK86jYQi2/0CQeSCnWWZkJq
+          =Qon/
+          -----END PGP PUBLIC KEY BLOCK-----
       mysql-wsrep:
-        key_id: BC19DDBA
-        key_server: hkp://p80.pool.sks-keyservers.net:80
         pin:
         - pin: 'release o=Galera Cluster'
           priority: 1001
           package: '*'
+        gpgkey: |
+          -----BEGIN PGP PUBLIC KEY BLOCK-----
+          Comment: key_id: BC19DDBA
+
+          mQENBFSC9PABCADViCrLIvhcuppbuFaCRiZYLvCoZ8st9uMwrofvbVbokWFZgwq/
+          tGzCi4o2O042hZS1q9FrB5au8u/Hj/NtGHLXpuSo6IvsAE+dkhSOKvBHxjvVLhbR
+          WYA4EmHAMiCVTYI71MGSrsWcAm0aBwtieXiMavo46cjscQGuXh2qiHuH8UQk3sW0
+          1yHngS27zg5tXHa1OXL1AwN9fnINoyHfMv0Qtt7xVjTW8YCJqESuK8rVAhI53hBM
+          FEhVRkay2y07olHXD40Q1/+pZ/Bzo5t6VZVOidiml/Euu2QWEvVKVKEe8zhEXkJr
+          ZdwTe4gIlsF78gD6uycllurMl0QFM+uhcUyhABEBAAG0JUNvZGVyc2hpcCBPeSA8
+          aW5mb0BnYWxlcmFjbHVzdGVyLmNvbT6JATgEEwECACIFAlSC9PACGwMGCwkIBwMC
+          BhUIAgkKCwQWAgMBAh4BAheAAAoJENZpAX68Gd26ovwIAMEm1mBMvMjrB9N6vbZx
+          nuxWmbW2IqINbL5oSsk7+wn0tZteywk+BWNuiU7mVVChuIRl/PtbETUyJkf7SDNx
+          qk7JGtMjL5fZZ/mcwC/vCLVjJHIgkuFodqnnJ40kp2+pwrn5+Xp5H6Z6dLwTBFv4
+          IW34SgKlH63+xYVPImBsse8a9b7UwevWpoY+NNGDTaGdvGk6hJd2teuU5f7DbVe9
+          9WFbdoLt4f0ZZhEW1IWbyW4s6JWrOhnd7EpzrSzwAA+MyETbGkyXBmaAybYGtE3/
+          XdZzyvQcgBkYHOVHy/AJnW6bRrTfiUVGqF5TCFbTAcw0flwV4PkyJVszbhySRhUh
+          oHS5AQ0EVIL08AEIANKaVOsr6NVO1Dnn367JiXf+52dAMcuIvd8y9UY7RP3ONdRB
+          XbwmnknQDrVTAblWxH3lZdsjQwJkmM7l0ryKWhJMYsarbjIHTkKXdT5juskm0PXg
+          gPj+xJm9ejNBWj7IpPicILBJmvIs3DtQ9LGYkyxCmABBycw0OkXiJAODj3AB2f7+
+          D7PEMwwGH1KZDPD5PX54IXThHwzsakRa2qApyk8/K8NN6uBOhVXSx4MAbzTwf5U6
+          zRlN/HO6Rd2vRBA15VkaJWwPlQAGSVLyApkUB/CXh7bwB0Bdp2ttZnaYVI4IHqyB
+          Vi5b0VY1bBYZplGhnB91avSX/jiL1fQVnnbOAOMAEQEAAYkBHwQYAQIACQUCVIL0
+          8AIbDAAKCRDWaQF+vBnduqSlCADPD52hKg1DNmBRJ3dHM5qx3K5evbGTsyi5G2ol
+          G0C03VJbovZ6UTI+34dsw5YaRfxHmjsO7sH+PAk/4F+xOHz+Q7I7MRITTgV+tlcl
+          LSE6riAFllfIvCm2zPwViUwLJfurqINOke010szCw+gynJgp40M1YFGwu2wSeWaN
+          7SO8eIe7BqaJ0tgh8INLbh2QhLpvszZTWrKEOE7ReLwzo9uB7Le09D3uTussGrNk
+          3/lvP1T0Y+McC3Js00nprdUgk17tDDmt+ikl2IWO02litImXQexEeRoA1YiagJX0
+          CCJXr6iFgKG+7gpDxa0H49GuJPK86jYQi2/0CQeSCnWWZkJq
+          =Qon/
+          -----END PGP PUBLIC KEY BLOCK-----
       mitaka-staging_PPA:
         source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/mitaka-staging/ubuntu trusty main"
-        key_id: 8A6844A29F68104E
-        key_server: hkp://p80.pool.sks-keyservers.net:80
+        gpgkey: |
+          -----BEGIN PGP PUBLIC KEY BLOCK-----
+          Comment: key_id: 8A6844A29F68104E
+
+          mI0EUCEyTAEEAMuUxyfiegCCwn4J/c0nw5PUTSJdn5FqiUTq6iMfij65xf1vl0g/
+          Mxqw0gfgAJIsCDvO9N9dloLAwF6FUBMg5My7WyhRPTAKF505TKJboyX3Pp4J1fU1
+          LV8QFVOp87vUh1RzB6GU7cSglhnbL85gmbJTllkzkb3h4Yw7W+edjcQ/ABEBAAG0
+          K0xhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBDbG91ZCBBcmNoaXZlIFRlYW2IuAQT
+          AQIAIgUCUCEyTAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQimhEop9o
+          EE7kJAP/eTBgq3Mhbvo0d8elMOuqZx3nmU7gSyPhep0zYIRZ5TJWl/7PRtvp0CJA
+          6N6ZywYTQ/4ANHhpibcHZkh8K0AzUvsGXnJRSFoJeqyDbD91EhoO+4ZfHs2HvRBQ
+          EDZILMa2OyuB497E5Mmyua3HDEOrG2cVLllsUZzpTFCx8NgeMHk=
+          =jLBm
+          -----END PGP PUBLIC KEY BLOCK-----