diff --git a/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_test/mysql_stretch_compatible.rb b/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_test/mysql_stretch_compatible.rb
new file mode 100644
index 000000000..d95a30073
--- /dev/null
+++ b/modules/services/unix/database/mysql_stretch_compatible/mysql/secgen_test/mysql_stretch_compatible.rb
@@ -0,0 +1,17 @@
+require_relative '../../../../../lib/post_provision_test'
+
+class MySQLStretchTest < PostProvisionTest
+  def initialize
+    self.module_name = 'mysql_stretch_compatible'
+    self.module_path = get_module_path(__FILE__)
+    super
+    self.port = 3306
+  end
+
+  def test_module
+    super
+    test_service_up
+  end
+end
+
+MySQLStretchTest.new.run
\ No newline at end of file
diff --git a/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_test/mysql_wheezy_compatible.rb b/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_test/mysql_wheezy_compatible.rb
new file mode 100644
index 000000000..7a53abfd7
--- /dev/null
+++ b/modules/services/unix/database/mysql_wheezy_compatible/mysql/secgen_test/mysql_wheezy_compatible.rb
@@ -0,0 +1,17 @@
+require_relative '../../../../../lib/post_provision_test'
+
+class MySQLWheezyTest < PostProvisionTest
+  def initialize
+    self.module_name = 'mysql_wheezy_compatible'
+    self.module_path = get_module_path(__FILE__)
+    super
+    self.port = 3306
+  end
+
+  def test_module
+    super
+    test_service_up
+  end
+end
+
+MySQLWheezyTest.new.run
\ No newline at end of file
diff --git a/modules/services/unix/http/apache_bash_cgi/secgen_metadata.xml b/modules/services/unix/http/apache_bash_cgi/secgen_metadata.xml
index cbc588364..b1f2a0eaa 100644
--- a/modules/services/unix/http/apache_bash_cgi/secgen_metadata.xml
+++ b/modules/services/unix/http/apache_bash_cgi/secgen_metadata.xml
@@ -14,6 +14,10 @@
   <reference>https://httpd.apache.org/</reference>
   <software_license>Apache v2</software_license>
 
+  <conflict>
+    <type>webapp</type>
+  </conflict>
+
   <requires>
     <module_path>.*apache</module_path>
     <type>httpd</type>
diff --git a/modules/services/unix/http/apache_bash_cgi/secgen_test/apache_bash_cgi.rb b/modules/services/unix/http/apache_bash_cgi/secgen_test/apache_bash_cgi.rb
new file mode 100644
index 000000000..9343efa95
--- /dev/null
+++ b/modules/services/unix/http/apache_bash_cgi/secgen_test/apache_bash_cgi.rb
@@ -0,0 +1,17 @@
+require_relative '../../../../../lib/post_provision_test'
+
+class ApacheBashCGITest < PostProvisionTest
+  def initialize
+    self.module_name = 'apache_bash_cgi'
+    self.module_path = get_module_path(__FILE__)
+    super
+    self.port = 80
+  end
+
+  def test_module
+    super
+    test_service_up
+  end
+end
+
+ApacheBashCGITest.new.run
\ No newline at end of file
diff --git a/modules/services/unix/irc/irc2/secgen_test/irc2.rb b/modules/services/unix/irc/irc2/secgen_test/irc2.rb
new file mode 100644
index 000000000..7761fac90
--- /dev/null
+++ b/modules/services/unix/irc/irc2/secgen_test/irc2.rb
@@ -0,0 +1,17 @@
+require_relative '../../../../../lib/post_provision_test'
+
+class IRC2Test < PostProvisionTest
+  def initialize
+    self.module_name = 'irc2'
+    self.module_path = get_module_path(__FILE__)
+    super
+    self.port = 6667
+  end
+
+  def test_module
+    super
+    test_service_up
+  end
+end
+
+IRC2Test.new.run
\ No newline at end of file
diff --git a/modules/vulnerabilities/unix/misc/distcc_exec/secgen_test/distcc_exec.rb b/modules/vulnerabilities/unix/misc/distcc_exec/secgen_test/distcc_exec.rb
new file mode 100644
index 000000000..e3e3245e5
--- /dev/null
+++ b/modules/vulnerabilities/unix/misc/distcc_exec/secgen_test/distcc_exec.rb
@@ -0,0 +1,17 @@
+require_relative '../../../../../lib/post_provision_test'
+
+class DistCCExecTest < PostProvisionTest
+  def initialize
+    self.module_name = 'distcc_exec'
+    self.module_path = get_module_path(__FILE__)
+    super
+    self.port = 3632
+  end
+
+  def test_module
+    super
+    test_service_up
+  end
+end
+
+DistCCExecTest.new.run
\ No newline at end of file