diff --git a/manifests/site.pp b/manifests/site.pp
index fa66ff9803..ce96c703d9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -802,6 +802,7 @@ node 'single-use-slave-bare' {
 
 # Node-OS: centos6
 # Node-OS: centos7
+# Node-OS: fedora21
 # Node-OS: precise
 # Node-OS: trusty
 # This is not meant to be an actual node that connects to the master.
diff --git a/tools/apply-test.sh b/tools/apply-test.sh
index 78c2255d25..fff67c3b19 100755
--- a/tools/apply-test.sh
+++ b/tools/apply-test.sh
@@ -79,6 +79,9 @@ if [[ `lsb_release -i -s` == 'CentOS' ]]; then
     fi
 elif [[ `lsb_release -i -s` == 'Ubuntu' ]]; then
     CODENAME=`lsb_release -c -s`
+elif [[ `lsb_release -i -s` == 'Fedora' ]]; then
+    REL=`lsb_release -r -s`
+    CODENAME="fedora$REL"
 fi
 
 FOUND=0