diff --git a/yum/files/keys/rpmfusion-free-el-6.key b/yum/files/keys/rpmfusion-free-el-6.key
new file mode 100644
index 0000000..132a5f3
--- /dev/null
+++ b/yum/files/keys/rpmfusion-free-el-6.key
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.0
+
+mQINBEy53zABEACt2pURGOKxSsGNPyhk8qmwiHVeUwWdsx1ORPIAWz3NGpO0AEPDO0i1OTkp
+Z2p0/UYkdt6t6Gu7eH6nETOglh1gIqrZ3eNXNgU7+XMQokurbMHbFIhfUpdzRpEvADJ0kL2c
+DTjU8oSHIbcSQkUQR2CPXmxB6St9asxCVHhdrOGCMs3gVNA4m6ILny4xeOH1ITCi2KXC+m66
+TQfwoESmsy1GF3XI4cl3+Od6CXKKOAiiVaz/cyW4mhmoZFLmwiGcTja52njU+UdpOcRlADju
+BL+Pt7sHzR1UjDY7QhovEqwdMJK1Vcg5L8TCdLEi1HU3qWrLwInTNpVqKVYp0ISh2nnlTIhn
+//ubUtFkeYH2ibeygJHuadZ7eeI6S5SKwd5Ja1pwWTsl8SqY8HHCqqBeqYWfAh4jr4pFK06Q
+ueBhbSz0x1jYdpzYTwgXe8cHiAOmzGRIn3UQ5naDv/F46FHMfM7nGCNKbwB8a35I3w+hJwXq
+bU5NLc+C56bagBH74fnL+Ai+oxx2JdgCE58lKXjIkWN4ZyPjDI7JvOdPrwGlqmmuN7b4tGoH
+FvuZNAMqnmTRlqZEFHZCCkfBmVL+ZLmapSeq0tjRQboOXywoyV+QFdVLTlkr+bB5JPvRWPSJ
+kwPbGjmyJNvS2V8r3pXZL5Hat7gEGDDb00dnIxxV023cN9xT0QARAQABtE5SUE0gRnVzaW9u
+IGZyZWUgcmVwb3NpdG9yeSBmb3IgRUwgKDYpIDxycG1mdXNpb24tYnVpbGRzeXNAbGlzdHMu
+cnBtZnVzaW9uLm9yZz6JAjYEEwECACAFAky53zACGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
+gAAKCRBWNgnfhJxEn+c6D/0RsRtvD6G13mgbpfihR2Xf0pQJ30rdB/I/Zqtaz0bERtWlhcX+
+ykODzBVx8UpSR2WiA8Zfxth2DUJ06zjoUunzZIQaDouGTcwElLV548u7CzNmw61bi12jaXIk
+k0n8jluXF4/5D94EZWoW4QIKb0UntFEqbJvRhMX8iQvar+82AMwFV5xQt5ZvhU97dOOO3d7r
+s3YQlf2TqlL8LW1AIMG1HOYeRl5puGJvNieLlwzCaN0q9cwNiMwnp5bt/UcslG16g1YeonK3
+yGiHupZ0PbeehPmLyFwO+WDoYoPW6tIHZw6KSYwiqp+pHCfhGXG9uYuj7wI3GgUgX66c/X3X
+jipxSYhriv6aKWpSOY1N/BmHnsjrCDnp9pOqo1f1OXmnpR48WSktoGBupOro5YWmq9JEGP8A
+V5CvRE0jF3NN7Kzk7BdZsgCNZY1pJKbv2++Lh0ZOhoNlMBE1yVxfjVunBO7HcUJNyoZVkfSV
+86TOVV/eILWZWAor0oxXvX4f4i4zjAlymuGb5kSPO+VJLpqaM1liXz+vGx3y932Kjv0Fl4r4
+xpkn5nC+S4LIFtls8cgQzFP4lCoYShGUCZRyKQVuvqdZ3Q9CRbbHAcZFBLMLN7zwKeAUus31
+Ske/XxLPEjO/8BzT3PCAj5XuVAyXE2ULKguNONIlIXt0TcKfMzIWnM9AVQ==
+=rpZS
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/yum/files/keys/rpmfusion-nonfree-el-6.key b/yum/files/keys/rpmfusion-nonfree-el-6.key
new file mode 100644
index 0000000..6f9a126
--- /dev/null
+++ b/yum/files/keys/rpmfusion-nonfree-el-6.key
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+mQINBEy53pkBEAC7tgADsKPyzLOqMfPT1FxFWcTFoNtthLYZxZwFsjvZxNQJP7VZ
+ja0gO0OFUl4izDNwK6eClRgNrHX7x6pKl64Nf8hk6uJCyRO4eFbdw6SK5X1LMoys
+d62yDOu07MIIGLGzzpXG6cxCVaJ9lLXNWykJQT3807kptwRzajxgEK2AjcHpW9ij
+OzC4gjfbeOTEL9glgu9LM75J8WcdNlXhg5HZEVA7vpAgTkGA635Y0l/8ZRBvE3V6
+D4/BBxS4MsuWK4HiosgZUxrrzsP8UeHTmeXimupVnMZXkgPtZjZwP5G0ShZVpwY3
+oKev2lYf7dNQVsThT0yxemAWb6sXaaUm5c9sMoJ0acktVl2425DxDnJLvN685pAG
+NZWJINtHi8jMFSHwfnHo/sQDMQQy09sGt9ruglFWTUBsK7goFtarBy9clukRck7k
+TWfxtSXIGJgoiEZbCyJ13YrEbeT7+T8f0ocGb4yZ6IsUTORb1eSpIjVqN3Dv/UEl
+nSdZK+OsQ6MRVks2hhn4s4BLQO33d3wMRmQkYyH16aGJQGxxilTl58udFd9EbOYB
+MDEEKJxv0uJOjOKUZHbUpzqfq4c0HuoI7CdaZSh/h13vWdLVFVwMGGKoeyRs1Qx4
+c8+weWrIuElr6xAMB1TCCjIUixQj5T2Qj2lMKWVS2y2HecH5Met5dgZYxwARAQAB
+tFFSUE0gRnVzaW9uIG5vbmZyZWUgcmVwb3NpdG9yeSBmb3IgRUwgKDYpIDxycG1m
+dXNpb24tYnVpbGRzeXNAbGlzdHMucnBtZnVzaW9uLm9yZz6JAjYEEwECACAFAky5
+3pkCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRCLDw/tVWi7smLQD/4q1yA8
+l/Thto31tdrUWHi2YTVLTf/1jTZKqnlSZLkih3BMaUTRd2rAVUDf0TneRasnYlGf
+Xh95dPbpFRb6yWDYrVa3+06KCAEhvCqIqmekjZ9qd9VtA4LrXOPQCe0008KLXHgv
+9UaManPTmog5dvCjIda0gyDEBTxnjseQ7b+56hW3wMz8DDk1fT2uoi8e+zP16Rga
+NygjOwUDwpJSKUXHYxpgyh8C0vOFlcsUJ/RZR0k2DgQUtdNzQpp8yN7zFIy5d2kp
+SdJ2Ae9QzQryjYxvNpA/48h8873UxNpB6dx4moKFbeC/YVX+3nJL0dAV3lRAKU7F
+UNPnei5wiaN2Mwm0oEMiTfZCxshjh8JZgWnlZ5//5IoczTXgLrfyHUxW2oPBk5cs
+34iB8vCGTvH/cHFQh9kHPJB+tJSnv+NYgpXoRkw5ZHkts1LV68PKjw0FA/T4Hfl0
+Atv6YZ242e1+fAJJ9iSKmYRNBWXBGBzt0Rxb3oddbO1mTFPlBHzyQwLVUR/M6Q2R
+72yG6e+7tLgJDiTRy522ui2GWgA8WZo0J5XFXbjM/9iVNvrftKe0uTTUq0A39l6S
+0Kd/7xbonpKJcsmM8xn3nUTU0yrSIl3VckBQHufkXhXO9XP13+8iQoJhNazufjKL
+bdTr4PZ3NOhXiTRgfdhUcCjz+X1sH3leoVxFaA==
+=uRut
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/yum/manifests/init.pp b/yum/manifests/init.pp
index 47bc822..1451fff 100644
--- a/yum/manifests/init.pp
+++ b/yum/manifests/init.pp
@@ -255,16 +255,27 @@ class yum::repo::rpmfusion-free {
 }
 
 
+# Add RPM Fusion Free Testing repository
+#
+class yum::repo::rpmfusion-free-testing {
+
+    include yum::repo::rpmfusion-free
+
+    yum::repo { "rpmfusion-free-updates-testing":
+        descr      => "RPM Fusion for ${yum::common::osname} \$releasever - Free - Test Updates",
+        mirrorlist => "http://mirrors.rpmfusion.org/mirrorlist?repo=free-${yum::common::osname}-updates-testing-\$releasever&arch=\$basearch",
+        gpgkey     => "puppet:///modules/yum/keys/rpmfusion-free-${yum::common::osname}-${yum::common::osver}.key",
+    }
+
+}
+
+
 # Add RPM Fusion Nonfree repository
 #
 # Enabling this will also enable RPM Fusion Free repository.
 #
 class yum::repo::rpmfusion-nonfree {
 
-    if $operatingsystem != "Fedora" {
-        fail("RPM Fusion Free repository not supported in ${operatingsystem}")
-    }
-
     include yum::common
     include yum::repo::rpmfusion-free
 
@@ -282,6 +293,24 @@ class yum::repo::rpmfusion-nonfree {
 }
 
 
+# Add RPM Fusion Nonfree Testing repository
+#
+# Enabling this will also enable RPM Fusion Free repository.
+#
+class yum::repo::rpmfusion-nonfree-testing {
+
+    include yum::repo::rpmfusion-nonfree
+    include yum::repo::rpmfusion-free-testing
+
+    yum::repo { "rpmfusion-nonfree-updates-testing":
+        descr      => "RPM Fusion for ${yum::common::osname} \$releasever - Nonfree - Test Updates",
+        mirrorlist => "http://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-${yum::common::osname}-updates-testing-\$releasever&arch=\$basearch",
+        gpgkey     => "puppet:///modules/yum/keys/rpmfusion-nonfree-${yum::common::osname}-${yum::common::osver}.key",
+    }
+
+}
+
+
 # Add Skype repository
 #
 class yum::repo::skype {