diff --git a/testsuite/Modules/tests/SambaTrustDom.ycp b/testsuite/Modules/tests/SambaTrustDom.ycp
index 39456d4..f5f30c2 100644
--- a/testsuite/Modules/tests/SambaTrustDom.ycp
+++ b/testsuite/Modules/tests/SambaTrustDom.ycp
@@ -1,5 +1,5 @@
 {
-    //testedfiles: SambaTrustDom.ycp
+    //testedfiles: SambaTrustDom.pm
 
     include "testsuite.ycp";
 
diff --git a/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp b/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp
index 49173d7..c4ae80b 100644
--- a/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp
+++ b/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp
@@ -3,7 +3,7 @@
 // test for YaPI::Samba::AddSAM()
 // $Id$
 
-    // testedfiles: Samba.pm
+    // testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-AddSAM.ycp b/testsuite/YaPI/tests/YaPI-AddSAM.ycp
index 098a3a6..5999705 100644
--- a/testsuite/YaPI/tests/YaPI-AddSAM.ycp
+++ b/testsuite/YaPI/tests/YaPI-AddSAM.ycp
@@ -3,7 +3,7 @@
 // test for YaPI::Samba::AddSAM()
 // $Id$
 
-    // testedfiles: Samba.pm
+    // testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-AddShare.ycp b/testsuite/YaPI/tests/YaPI-AddShare.ycp
index aa3ecc1..0f3475b 100644
--- a/testsuite/YaPI/tests/YaPI-AddShare.ycp
+++ b/testsuite/YaPI/tests/YaPI-AddShare.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::AddShare()
 // $Id$
-// testedfiles: SambaServer.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp b/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp
index 8aaae7e..c8238fe 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp
@@ -1,6 +1,6 @@
 {
 
-    // testedfiles: Samba.pm
+// testedfiles: SambaConfig.pm
 
 // test for YaPI::Samba::DeleteSAM()
 // $Id$
diff --git a/testsuite/YaPI/tests/YaPI-DeleteSAM-3.ycp b/testsuite/YaPI/tests/YaPI-DeleteSAM-3.ycp
index f01b98a..b801f7e 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteSAM-3.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteSAM-3.ycp
@@ -3,7 +3,7 @@
 // test for YaPI::Samba::DeleteSAM()
 // $Id$
 
-    // testedfiles: Samba.pm
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-DeleteSAM.ycp b/testsuite/YaPI/tests/YaPI-DeleteSAM.ycp
index 147e7d3..0a8901e 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteSAM.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteSAM.ycp
@@ -3,7 +3,7 @@
 // test for YaPI::Samba::DeleteSAM()
 // $Id$
 
-    // testedfiles: Samba.pm
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-DeleteShare-2.ycp b/testsuite/YaPI/tests/YaPI-DeleteShare-2.ycp
index 041a15b..4105ad3 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteShare-2.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteShare-2.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::DeleteShare()
 // $Id$
-// testedfiles: SambaServer.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-DeleteShare.ycp b/testsuite/YaPI/tests/YaPI-DeleteShare.ycp
index a4df80e..77418fd 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteShare.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteShare.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::DeleteShare()
 // $Id$
-// testedfiles: SambaServer.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditDefaultSAM.ycp b/testsuite/YaPI/tests/YaPI-EditDefaultSAM.ycp
index 0b87c2d..13b3f67 100644
--- a/testsuite/YaPI/tests/YaPI-EditDefaultSAM.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditDefaultSAM.ycp
@@ -3,7 +3,7 @@
 // test for YaPI::Samba::EditDefaultSAM()
 // $Id$
 
-    // testedfiles: Samba.pm
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditSAMConfiguration.ycp b/testsuite/YaPI/tests/YaPI-EditSAMConfiguration.ycp
index fb7d23e..2e1e1c5 100644
--- a/testsuite/YaPI/tests/YaPI-EditSAMConfiguration.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditSAMConfiguration.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EditSAMConfiguration()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditServerAsBDC.ycp b/testsuite/YaPI/tests/YaPI-EditServerAsBDC.ycp
index 365c9e1..5758eda 100644
--- a/testsuite/YaPI/tests/YaPI-EditServerAsBDC.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditServerAsBDC.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EditServerAsBDC()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaRole.pm SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditServerAsPDC.ycp b/testsuite/YaPI/tests/YaPI-EditServerAsPDC.ycp
index 1966a81..35640b6 100644
--- a/testsuite/YaPI/tests/YaPI-EditServerAsPDC.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditServerAsPDC.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EditServerAsPDC()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaRole.pm SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditServerAsStandalone.ycp b/testsuite/YaPI/tests/YaPI-EditServerAsStandalone.ycp
index 2dad587..4dc9998 100644
--- a/testsuite/YaPI/tests/YaPI-EditServerAsStandalone.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditServerAsStandalone.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EditServerAsStandalone()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditServerDescription.ycp b/testsuite/YaPI/tests/YaPI-EditServerDescription.ycp
index b55ed0e..3b7216f 100644
--- a/testsuite/YaPI/tests/YaPI-EditServerDescription.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditServerDescription.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EditServerDescription()
 // $Id$
-// testedfiles: SambaServer.ycp 
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EditShare.ycp b/testsuite/YaPI/tests/YaPI-EditShare.ycp
index cfe64b9..bf4cf42 100644
--- a/testsuite/YaPI/tests/YaPI-EditShare.ycp
+++ b/testsuite/YaPI/tests/YaPI-EditShare.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EditShare()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EnableHomes.ycp b/testsuite/YaPI/tests/YaPI-EnableHomes.ycp
index e06ce12..4841fec 100644
--- a/testsuite/YaPI/tests/YaPI-EnableHomes.ycp
+++ b/testsuite/YaPI/tests/YaPI-EnableHomes.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EnableHomes()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EnableNetlogon.ycp b/testsuite/YaPI/tests/YaPI-EnableNetlogon.ycp
index 9d825e1..adfa1b7 100644
--- a/testsuite/YaPI/tests/YaPI-EnableNetlogon.ycp
+++ b/testsuite/YaPI/tests/YaPI-EnableNetlogon.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EnableNetlogon()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EnableShare-2.ycp b/testsuite/YaPI/tests/YaPI-EnableShare-2.ycp
index 3c85b6c..ee8cc9a 100644
--- a/testsuite/YaPI/tests/YaPI-EnableShare-2.ycp
+++ b/testsuite/YaPI/tests/YaPI-EnableShare-2.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EnablePrinters()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";
 
diff --git a/testsuite/YaPI/tests/YaPI-EnableShare.ycp b/testsuite/YaPI/tests/YaPI-EnableShare.ycp
index 41a86bf..4210caf 100644
--- a/testsuite/YaPI/tests/YaPI-EnableShare.ycp
+++ b/testsuite/YaPI/tests/YaPI-EnableShare.ycp
@@ -2,7 +2,7 @@
 
 // test for YaPI::Samba::EnablePrinters()
 // $Id$
-// testedfiles: Samba.ycp Service.ycp SambaServer.ycp Ldap.ycp
+// testedfiles: SambaConfig.pm
 
     import "SambaConfig";