diff --git a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
index 9f0fdc5c7..b2113c33c 100755
--- a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
+++ b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
@@ -1,12 +1,12 @@
 test_name "#4123: should list all running services on Redhat/CentOS"
 step "Validate services running agreement ralsh vs. OS service count"
 # This will remotely exec:
 # ticket_4123_should_list_all_running_redhat.sh
 
 hosts.each do |host|
-  if host['platform'].include?('centos') or host['platform'].include?('rhel')
+  if host['platform'].include?('el-')
     run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh')
   else
     skip_test "Test not supported on this plaform" 
   end
 end
diff --git a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
index 13ad5ceac..2b9b2b7f4 100755
--- a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
+++ b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
@@ -1,12 +1,12 @@
 test_name "#4124: should list all disabled services on Redhat/CentOS"
 step "Validate disabled services agreement ralsh vs. OS service count"
 # This will remotely exec:
 # ticket_4124_should_list_all_disabled.sh
 
 hosts.each do |host|
-  unless host['platform'].include? 'centos' or host['platform'].include? 'rhel'
+  unless host['platform'].include?('el-')
     skip_test "Test not supported on this plaform"
    else
     run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4124_should_list_all_disabled.sh')
   end
 end
diff --git a/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb b/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb
index d3b415691..fdcdd180a 100644
--- a/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb
+++ b/acceptance/tests/ticket_6857_password-disclosure-when-changing-a-users-password.rb
@@ -1,33 +1,33 @@
 test_name "#6857: redact password hashes when applying in noop mode"
 
 hosts_to_test = agents.reject do |agent|
-  if agent['platform'].match /(?:ubuntu|centos|debian|rhel)/
+  if agent['platform'].match /(?:ubuntu|centos|debian|el-)/
     result = on(agent, %q{ruby -e 'require "shadow" or raise'}, :silent => true)
     result.exit_code != 0
   else
     false
   end
 end
 skip_test "No suitable hosts found" if hosts_to_test.empty?
 
 adduser_manifest = <<MANIFEST
 user { 'passwordtestuser':
   ensure   => 'present',
   password => 'apassword',
 }
 MANIFEST
 
 changepass_manifest = <<MANIFEST
 user { 'passwordtestuser':
   ensure   => 'present',
   password => 'newpassword',
   noop     => true,
 }
 MANIFEST
 
 apply_manifest_on(hosts_to_test, adduser_manifest )
 results = apply_manifest_on(hosts_to_test, changepass_manifest )
 
 results.each do |result|
   assert_match( /current_value \[old password hash redacted\], should be \[new password hash redacted\]/ , "#{result.host}: #{result.stdout}" )
 end