4 files changed, 4 insertions, 3 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d70517f..6c5967c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
           echo 'm4_define([AT_PACKAGE_VERSION],   [@PACKAGE_VERSION@])'; \
           echo 'm4_define([AT_PACKAGE_STRING],    [@PACKAGE_STRING@])'; \
           echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+          echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \
         } >$(srcdir)/package.m4
 
 #
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 142b9ed..5d6b7f3 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,6 +2,6 @@
 # Configurable variable values for vmod_dict test suite.
 # Copyright (C) 2017 Sergey Poznyakoff
 
-PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH
+PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH
 VARNISHTEST=@VARNISHTEST@
 VARNISHD=@VARNISHD@
diff --git a/tests/ci.at b/tests/ci.at
index d486188..1115316 100644
--- a/tests/ci.at
+++ b/tests/ci.at
@@ -1,6 +1,6 @@
 AT_SETUP([case-insensitive])
 AT_KEYWORDS([case-insensitive])
-AT_VARNISHTEST([dict],[
+AT_VARNISHTEST([
         sub vcl_init {
                 dict.ci(true);
                 dict.collisions(0);
diff --git a/tests/cs.at b/tests/cs.at
index 0333943..11366c4 100644
--- a/tests/cs.at
+++ b/tests/cs.at
@@ -1,6 +1,6 @@
 AT_SETUP([case-sensitive])
 AT_KEYWORDS([case-sensitive])
-AT_VARNISHTEST([dict],[
+AT_VARNISHTEST([
         sub vcl_init {
                 dict.collisions(0);
                 dict.load("\${vmod_topsrc}/tests/num.dict");