diff --git a/acceptance/config/el6/setup/jenkins/pre-suite/02_StopFirewall.rb b/acceptance/config/el6/setup/jenkins/pre-suite/02_StopFirewall.rb
index 3de979944..d02e80163 100644
--- a/acceptance/config/el6/setup/jenkins/pre-suite/02_StopFirewall.rb
+++ b/acceptance/config/el6/setup/jenkins/pre-suite/02_StopFirewall.rb
@@ -1,3 +1,12 @@
-#test_name "Stop firewall" do
-#  on hosts, puppet_resource('service', 'iptables', 'ensure=stopped')
-#end
+test_name "Stop firewall" do
+  hosts.each do |host|
+    case host['platform']
+    when /fedora/
+      on host, puppet('resource', 'service', 'firewalld', 'ensure=stopped')
+    when /el|centos|debian|ubuntu/
+      on host, puppet('resource', 'service', 'iptables', 'ensure=stopped')
+    else
+      logger.notify("Not sure how to clear firewall on #{host['platform']}")
+    end
+  end
+end