diff --git a/lib/beaker/hypervisor.rb b/lib/beaker/hypervisor.rb
index 8f82c3a6a0..d4cae204dd 100644
--- a/lib/beaker/hypervisor.rb
+++ b/lib/beaker/hypervisor.rb
@@ -96,9 +96,6 @@ def configure
       if @options[:add_el_extras]
         add_el_extras(@hosts, @options)
       end
-      if @options[:package_proxy]
-        package_proxy(@hosts, @options)
-      end
       if @options[:disable_iptables]
         disable_iptables @hosts, @options
       end
@@ -106,6 +103,10 @@ def configure
 
     #Default validation steps to be run for a given hypervisor
     def validate
+      if @options[:package_proxy]
+        package_proxy(@hosts, @options)
+        @options.delete(:package_proxy)
+      end
       if @options[:validate]
         validate_host(@hosts, @options)
       end