diff --git a/acceptance/bin/ci-rerun-pe-puppet.sh b/acceptance/bin/ci-rerun-pe-puppet.sh
index 492fa26e9..ba9311b3f 100755
--- a/acceptance/bin/ci-rerun-pe-puppet.sh
+++ b/acceptance/bin/ci-rerun-pe-puppet.sh
@@ -1,123 +1,126 @@
 #!/bin/bash
 ##!/bin/bash +e +x
 
 #source /usr/local/rvm/scripts/rvm
 #rvm use ruby-1.9.3-p392
 
 umask 0002
 
 cd acceptance
 
 if [ -z "$tests" ]; then
 echo "Must provide tests to run in the environment variable 'tests': got '$tests'"
 exit 1
 fi
 
 if [ -z "$platform" ]; then
   echo "'platform' not set: should be 'el-6-x86_64' or 'ubuntu-1204-i386' or some other platform string acceptable to Beaker"
   exit 1
 fi
 
 if [ -z "$1" ]; then
 echo "Must provide the hostname: got '$1'"
 exit 1
 fi
 
+domain=${domain:-delivery.puppetlabs.net}
+
 if [ -z "$2" ]; then
 
   cat > hosts-immediate.cfg << EOHOSTS
 ---
 HOSTS:
-  ${1}.delivery.puppetlabs.net:
+  ${1}.${domain}:
     roles:
     - agent
     - master
     - dashboard
     - database
     platform: ${platform} 
 CONFIG:
   nfs_server: none
   consoleport: 443
   datastore: instance0
   folder: Delivery/Quality Assurance/Enterprise/Dynamic
   resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
 EOHOSTS
 
 else
 
   if [ -z "$3" ]; then
 
     cat > hosts-immediate.cfg << EOHOSTS
 ---
 HOSTS:
-  ${1}.delivery.puppetlabs.net:
+  ${1}.${domain}:
     roles:
     - agent
     - dashboard
     - database
     - master
     platform: ${platform}
-  ${2}.delivery.puppetlabs.net:
+  ${2}.${domain}:
     roles:
     - agent
     platform: ${platform}
 CONFIG:
   nfs_server: none
   consoleport: 443
   datastore: instance0
   folder: Delivery/Quality Assurance/Enterprise/Dynamic
   resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
 EOHOSTS
 
   else
 
     cat > hosts-immediate.cfg << EOHOSTS
 ---
 HOSTS:
-  ${1}.delivery.puppetlabs.net:
+  ${1}.${domain}:
     roles:
     - master
     - dashboard
     - database
     platform: ${platform}
-  ${2}.delivery.puppetlabs.net:
+  ${2}.${domain}:
     roles:
     - agent
     platform: ${platform}
-  ${3}.delivery.puppetlabs.net:
+  ${3}.${domain}:
     roles:
     - agent
     platform: ${platform}
 CONFIG:
   nfs_server: none
   consoleport: 443
   datastore: instance0
   folder: Delivery/Quality Assurance/Enterprise/Dynamic
   resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
   pooling_api: http://vcloud.delivery.puppetlabs.net/
 EOHOSTS
 
   fi
 
 fi
 
 export forge_host=api-forge-aio01-petest.puppetlabs.com
 
 bundle exec beaker           \
   --xml                      \
   --debug                    \
   --repo-proxy               \
   --config hosts-immediate.cfg         \
   --pre-suite setup/common/pre-suite/110_SetPEPuppetService.rb \
   --tests=${tests}           \
   --keyfile ${HOME}/.ssh/id_rsa-acceptance \
   --root-keys \
   --helper lib/helper.rb \
   --preserve-hosts onfail \
-  --no-color
+  --no-color \
+  --no-validate
 
 RESULT=$?
 
 exit $RESULT