diff --git a/acceptance/config/nodes/all.yaml b/acceptance/config/nodes/all.yaml
index 0d2ed3741..58c543252 100644
--- a/acceptance/config/nodes/all.yaml
+++ b/acceptance/config/nodes/all.yaml
@@ -1,55 +1,55 @@
 HOSTS:
   master:
     roles:
       - master
       - agent
     platform: el-6-x86_64
     hypervisor: vcloud
     template: redhat-6-x86_64
   rhel-agent:
     roles:
       - agent
     platform: el-6-i386
     hypervisor: vcloud
     template: redhat-6-i386
   fedora-agent:
     roles:
       - agent
-    platform: fedora-18-i386
+    platform: fedora-21-i386
     hypervisor: vcloud
-    template: fedora-18-i386
+    template: fedora-21-i386
   ubuntu-agent:
     roles:
       - agent
     platform: ubuntu-lucid-i386
     hypervisor: vcloud
     template: ubuntu-1004-i386
   wheezy-agent:
     roles:
       - agent
     platform: debian-wheezy-i386
     hypervisor: vcloud
     template: debian-7-i386
   centos-agent:
     roles:
       - agent
     platform: centos-5-i386
     hypervisor: vcloud
     template: centos-5-i386
   solaris-agent:
     roles:
       - agent
     platform: solaris-11-x86_64
     hypervisor: vcloud
     template: solaris-11-x86_64
   win2003r2-ruby193-2:
     roles:
       - agent
     platform: windows-2003r2-32
     hypervisor: vsphere
     snapshot: git
 CONFIG:
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/all_but_windows.yaml b/acceptance/config/nodes/all_but_windows.yaml
index 05d65a541..716a8e90d 100644
--- a/acceptance/config/nodes/all_but_windows.yaml
+++ b/acceptance/config/nodes/all_but_windows.yaml
@@ -1,49 +1,49 @@
 HOSTS:
   master:
     roles:
       - master
       - agent
     platform: el-6-x86_64
     hypervisor: vcloud
     template: redhat-6-x86_64
   rhel-agent:
     roles:
       - agent
     platform: el-6-i386
     hypervisor: vcloud
     template: redhat-6-i386
   fedora-agent:
     roles:
       - agent
-    platform: fedora-18-i386
+    platform: fedora-21-i386
     hypervisor: vcloud
-    template: fedora-18-i386
+    template: fedora-21-i386
   ubuntu-agent:
     roles:
       - agent
     platform: ubuntu-lucid-i386
     hypervisor: vcloud
     template: ubuntu-1004-i386
   wheezy-agent:
     roles:
       - agent
     platform: debian-wheezy-i386
     hypervisor: vcloud
     template: debian-7-i386
   centos-agent:
     roles:
       - agent
     platform: centos-5-i386
     hypervisor: vcloud
     template: centos-5-i386
   solaris-agent:
     roles:
       - agent
     platform: solaris-11-x86_64
     hypervisor: vcloud
     template: solaris-11-x86_64
 CONFIG:
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/all_linux.yaml b/acceptance/config/nodes/all_linux.yaml
index 73a16eca1..935621fa6 100644
--- a/acceptance/config/nodes/all_linux.yaml
+++ b/acceptance/config/nodes/all_linux.yaml
@@ -1,43 +1,43 @@
 HOSTS:
   master:
     roles:
       - master
       - agent
     platform: el-6-x86_64
     hypervisor: vcloud
     template: redhat-6-x86_64
   rhel-agent:
     roles:
       - agent
     platform: el-6-i386
     hypervisor: vcloud
     template: redhat-6-i386
   fedora-agent:
     roles:
       - agent
-    platform: fedora-18-i386
+    platform: fedora-21-i386
     hypervisor: vcloud
-    template: fedora-18-i386
+    template: fedora-21-i386
   ubuntu-agent:
     roles:
       - agent
     platform: ubuntu-lucid-i386
     hypervisor: vcloud
     template: ubuntu-1004-i386
   wheezy-agent:
     roles:
       - agent
     platform: debian-wheezy-i386
     hypervisor: vcloud
     template: debian-7-i386
   centos-agent:
     roles:
       - agent
     platform: centos-5-i386
     hypervisor: vcloud
     template: centos-5-i386
 CONFIG:
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/fedora18.yaml b/acceptance/config/nodes/fedora18.yaml
deleted file mode 100644
index 1a969b089..000000000
--- a/acceptance/config/nodes/fedora18.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-HOSTS:
-  master:
-    roles:
-      - master
-      - agent
-    platform: fedora-18-x86_64
-    hypervisor: vcloud
-    template: fedora-18-x86_64
-  agent:
-    roles:
-      - agent
-    platform: fedora-18-i386
-    hypervisor: vcloud
-    template: fedora-18-i386
-CONFIG:
-  datastore: instance0
-  resourcepool: delivery/Quality Assurance/FOSS/Dynamic
-  folder: Delivery/Quality Assurance/FOSS/Dynamic
-  pooling_api: http://vmpooler.delivery.puppetlabs.net/
diff --git a/acceptance/config/nodes/fedora19.yaml b/acceptance/config/nodes/fedora21.yaml
similarity index 73%
rename from acceptance/config/nodes/fedora19.yaml
rename to acceptance/config/nodes/fedora21.yaml
index 65cb70909..254af1dc2 100644
--- a/acceptance/config/nodes/fedora19.yaml
+++ b/acceptance/config/nodes/fedora21.yaml
@@ -1,19 +1,19 @@
 HOSTS:
   master:
     roles:
       - master
       - agent
-    platform: fedora-19-x86_64
+    platform: fedora-21-x86_64
     hypervisor: vcloud
-    template: fedora-19-x86_64
+    template: fedora-21-x86_64
   agent:
     roles:
       - agent
-    platform: fedora-19-i386
+    platform: fedora-21-i386
     hypervisor: vcloud
-    template: fedora-19-i386
+    template: fedora-21-i386
 CONFIG:
   datastore: instance0
   resourcepool: delivery/Quality Assurance/FOSS/Dynamic
   folder: Delivery/Quality Assurance/FOSS/Dynamic
   pooling_api: http://vmpooler.delivery.puppetlabs.net/