      });
      return TRUE;
  }
+diff --git a/testsuite/YaPI/Makefile.am b/testsuite/YaPI/Makefile.am
+index d9b12b0..956c637 100644
+--- a/testsuite/YaPI/Makefile.am
++++ b/testsuite/YaPI/Makefile.am
+@@ -5,7 +5,10 @@
+ #
+ 
+ AUTOMAKE_OPTIONS = dejagnu
+-EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh)
++EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.rb)
++
++Y2BASEFLAGS = -I tests
++export Y2BASEFLAGS
+ 
+ testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite
+ 
 diff --git a/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp b/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp
-index 49173d7..2ea5476 100644
+index c4ae80b..9aba24a 100644
 --- a/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp
 +++ b/testsuite/YaPI/tests/YaPI-AddSAM-2.ycp
 @@ -8,7 +8,7 @@

     SambaConfig::Import(
 	    $["global" : $[
diff --git a/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp b/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp
index 8aaae7e..c64a56e 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteSAM-2.ycp
@@ -8,7 +8,7 @@

     SambaConfig::Import( $[
                     "global" : $[
diff --git a/testsuite/YaPI/tests/YaPI-DeleteShare.ycp b/testsuite/YaPI/tests/YaPI-DeleteShare.ycp
index 77418fd..83f0797 100644
--- a/testsuite/YaPI/tests/YaPI-DeleteShare.ycp
+++ b/testsuite/YaPI/tests/YaPI-DeleteShare.ycp
@@ -7,7 +7,7 @@
